Merge git://git.kernel.org/pub/scm/linux/kernel/git/chr/carl9170fw into wol
authorChristian Lamparter <chunkeey@googlemail.com>
Sat, 28 May 2011 16:40:49 +0000 (18:40 +0200)
committerChristian Lamparter <chunkeey@googlemail.com>
Sat, 28 May 2011 16:40:49 +0000 (18:40 +0200)

Trivial merge