From: Tony Lindgren <tony@atomide.com>
Date: Thu, 1 Mar 2007 12:19:03 +0000 (-0800)
Subject: Merge omap-drivers
X-Git-Tag: v2.6.21-omap1~122
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4a1ca6a9d5db22400d8970f94bba5eae733a0c8;p=pandora-kernel.git

Merge omap-drivers

Conflicts:

	arch/arm/Kconfig
	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
	include/linux/i2c-id.h
---

d4a1ca6a9d5db22400d8970f94bba5eae733a0c8
Reading git-diff-tree failed