Merge branch 'for-rmk' of git://git.android.com/kernel into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Wed, 22 Oct 2008 18:34:09 +0000 (19:34 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 22 Oct 2008 18:34:09 +0000 (19:34 +0100)
commitf20e3b5fe7ead0615309433260b9784d8da0bbbd
treeeabb2e47a0355ac4e8024b7087b4e7cb9f324358
parentbcbfe664e7af019e698cef2feb85ac2b4f1ac11d
parentf030d7b65e4e6399f23de2a41a58d1b607b6bd89
Merge branch 'for-rmk' of git://git.android.com/kernel into devel
arch/arm/Kconfig
drivers/input/touchscreen/Kconfig