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)
commit8bd3397985e442761ce6956b3ba2e126a2577c42
tree150fb941a7246245376e0c3b728b96b8668c2b24
parentaf915846d44d23adc02c7ded807282d607b46faa
parent372720295915fda01606da3f4398165b37e5594a
Merge git://git./linux/kernel/git/chr/carl9170fw into wol