Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/chr/carl9170fw
authorChristian Lamparter <chunkeey@googlemail.com>
Wed, 29 Jun 2011 21:59:27 +0000 (23:59 +0200)
committerChristian Lamparter <chunkeey@googlemail.com>
Wed, 29 Jun 2011 21:59:27 +0000 (23:59 +0200)
commit35cac8dcfa9d01fff0c929f0e2b9cc38fc919589
treefe4cfe75c051928a285f9ac379456b4d13c80f62
parent7e4f4928397dbdcb0e2d4efa3c718e503d75dfae
parent6614f805fda27b63bad3e75a12432b436c0d2681
Merge branch 'master' of git://git./linux/kernel/git/chr/carl9170fw