Merge current mainline tree into linux-omap tree

author Tony Lindgren <tony@atomide.com>

Thu, 13 Mar 2008 08:59:16 +0000 (10:59 +0200)

committer Tony Lindgren <tony@atomide.com>

Thu, 13 Mar 2008 08:59:16 +0000 (10:59 +0200)
author Tony Lindgren <tony@atomide.com>
Thu, 13 Mar 2008 08:59:16 +0000 (10:59 +0200)
committer Tony Lindgren <tony@atomide.com>
Thu, 13 Mar 2008 08:59:16 +0000 (10:59 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/Makefile
Simple merge
diff --cc arch/arm/mach-omap1/board-h2.c
Simple merge
diff --cc arch/arm/plat-omap/dma.c
Simple merge
diff --cc drivers/i2c/chips/Makefile
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Thu, 13 Mar 2008 08:59:16 +0000 (10:59 +0200)
committer	Tony Lindgren <tony@atomide.com>
	Thu, 13 Mar 2008 08:59:16 +0000 (10:59 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-h2.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/dma.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/i2c/chips/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history