projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bcbfe66 f030d7b)
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 patch | diff1 | diff2 | blob | history
drivers/input/touchscreen/Kconfig patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge
diff --cc drivers/input/touchscreen/Kconfig
Simple merge
Unnamed repository; edit this file 'description' to name the repository.