Merge current mainline tree into linux-omap tree

author Tony Lindgren <tony@atomide.com>

Wed, 28 Nov 2007 22:06:26 +0000 (14:06 -0800)

committer Tony Lindgren <tony@atomide.com>

Wed, 28 Nov 2007 22:06:26 +0000 (14:06 -0800)
author Tony Lindgren <tony@atomide.com>
Wed, 28 Nov 2007 22:06:26 +0000 (14:06 -0800)
committer Tony Lindgren <tony@atomide.com>
Wed, 28 Nov 2007 22:06:26 +0000 (14:06 -0800)
diff --cc drivers/input/keyboard/Kconfig
Simple merge
diff --cc drivers/rtc/Kconfig
Simple merge
diff --cc drivers/spi/Kconfig
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Wed, 28 Nov 2007 22:06:26 +0000 (14:06 -0800)
committer	Tony Lindgren <tony@atomide.com>
	Wed, 28 Nov 2007 22:06:26 +0000 (14:06 -0800)
		1	2
drivers/input/keyboard/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/rtc/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/spi/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history