]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
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)
1  2 
arch/arm/Kconfig
drivers/input/touchscreen/Kconfig

Simple merge
Simple merge