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)
1  2 
carlfw/Kconfig

diff --cc carlfw/Kconfig
Simple merge