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

Merge omap-drivers

Conflicts:

	arch/arm/Kconfig
	arch/arm/boot/.gitignore
	arch/arm/configs/omap_h2_1610_defconfig
	arch/arm/configs/omap_osk_5912_defconfig
	arch/arm/mach-omap1/board-h2.c
	arch/arm/mach-omap1/clock.c
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/mach-omap2/board-h4.c
	arch/arm/oprofile/Makefile
	arch/arm/oprofile/common.c
	arch/arm/oprofile/op_arm_model.h
	arch/arm/oprofile/op_model_v6.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/input/keyboard/Makefile
	drivers/input/touchscreen/Kconfig
	drivers/input/touchscreen/ads7846.c
	drivers/leds/Kconfig
	drivers/leds/Makefile
	drivers/spi/Kconfig
	drivers/spi/Makefile
	drivers/spi/omap_uwire.c
	drivers/video/Kconfig
	drivers/video/Makefile
	drivers/video/backlight/Kconfig
	drivers/video/backlight/Makefile
	drivers/video/omap/Kconfig
	include/asm-arm/.gitignore
	include/linux/fb.h
	include/linux/spi/ads7846.h
---

ba6d3cf6f7900c7586cca6bbd9dca55d7c6386fb
Reading git-diff-tree failed