Merge current mainline tree into linux-omap tree

author Tony Lindgren <tony@atomide.com>

Tue, 18 Dec 2007 01:15:04 +0000 (17:15 -0800)

committer Tony Lindgren <tony@atomide.com>

Tue, 18 Dec 2007 01:15:04 +0000 (17:15 -0800)
author Tony Lindgren <tony@atomide.com>
Tue, 18 Dec 2007 01:15:04 +0000 (17:15 -0800)
committer Tony Lindgren <tony@atomide.com>
Tue, 18 Dec 2007 01:15:04 +0000 (17:15 -0800)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/boot/compressed/head.S
Simple merge
diff --cc drivers/watchdog/Kconfig
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Tue, 18 Dec 2007 01:15:04 +0000 (17:15 -0800)
committer	Tony Lindgren <tony@atomide.com>
	Tue, 18 Dec 2007 01:15:04 +0000 (17:15 -0800)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/compressed/head.S	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/watchdog/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history