From: Tony Lindgren <tony@atomide.com>
Date: Tue, 6 Mar 2007 12:27:36 +0000 (-0800)
Subject: Merge omap-drivers
X-Git-Tag: v2.6.21-omap1~97
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d76dea821270ce5d5ab1187776a2ba61d6c6fe23;p=linux-2.6-omap-h63xx.git

Merge omap-drivers

Conflicts:

	drivers/Makefile
	drivers/cbus/Kconfig
	drivers/cbus/retu-pwrbutton.c
	drivers/cbus/tahvo-usb.c
	drivers/video/omap/Kconfig
	drivers/video/omap/blizzard.c
	drivers/video/omap/dispc.c
	drivers/video/omap/omapfb_main.c
	drivers/video/omap/rfbi.c
	drivers/video/omap/sossi.c
---

d76dea821270ce5d5ab1187776a2ba61d6c6fe23