Merge http://git.kernel.org/pub/scm/linux/kernel/git/chr/carl9170fw
authorChristian Lamparter <chunkeey@googlemail.com>
Mon, 28 Feb 2011 19:07:48 +0000 (20:07 +0100)
committerChristian Lamparter <chunkeey@googlemail.com>
Mon, 28 Feb 2011 19:07:48 +0000 (20:07 +0100)
commit985f1f6849ec65147405763e9bb6c0e55ffcb789
tree1fc2dbae979177ac07b47cb299b410e8bd78a0db
parentd496f07eeee98f74d6aba3f7db5671d06864ed52
parentdb4d098aa5b5a873bd38461045bfb1aeb3080cf9
Merge git./pub/scm/linux/kernel/git/chr/carl9170fw
carlfw/Kconfig