From: Tony Lindgren <tony@atomide.com>
Date: Fri, 2 Mar 2007 10:04:11 +0000 (-0800)
Subject: Merge omap-drivers
X-Git-Tag: v2.6.21-omap1~116
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c2df9c97f82c1035ef5a696ed0ff5bc93ae01d71;p=linux-2.6-omap-h63xx.git

Merge omap-drivers

Conflicts:

	arch/arm/configs/omap_h2_1610_defconfig
	arch/arm/configs/omap_osk_5912_defconfig
	arch/arm/mach-omap1/board-h2.c
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/plat-omap/Kconfig
	arch/arm/plat-omap/Makefile
	arch/arm/plat-omap/devices.c
	arch/arm/plat-omap/dsp/dsp_common.c
	arch/arm/plat-omap/mailbox.c
	drivers/Makefile
	drivers/cbus/Kconfig
	drivers/cbus/retu-pwrbutton.c
	drivers/cbus/tahvo-usb.c
	drivers/video/omap/Kconfig
---

c2df9c97f82c1035ef5a696ed0ff5bc93ae01d71