From: Tony Lindgren <tony@atomide.com>
Date: Thu, 29 Mar 2007 14:23:55 +0000 (-0400)
Subject: Merge omap-drivers
X-Git-Tag: v2.6.21-omap1~69
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=30ef36b146be67d6985d5bdaf12d05a39e9a9fb4;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/Makefile
	arch/arm/mach-omap1/board-h2.c
	arch/arm/mach-omap1/mailbox.c
	arch/arm/mach-omap2/Makefile
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/mach-omap2/board-n800-dsp.c
	arch/arm/mach-omap2/io.c
	arch/arm/mach-omap2/mailbox.c
	arch/arm/plat-omap/Kconfig
	arch/arm/plat-omap/Makefile
	arch/arm/plat-omap/devices.c
	arch/arm/plat-omap/dsp/Kconfig
	arch/arm/plat-omap/dsp/dsp_common.c
	arch/arm/plat-omap/dsp/dsp_common.h
	arch/arm/plat-omap/dsp/omap1_dsp.h
	arch/arm/plat-omap/mailbox.c
	arch/arm/plat-omap/mailbox.h
	drivers/Makefile
	drivers/cbus/tahvo-usb.c
	drivers/spi/omap2_mcspi.c
	include/asm-arm/arch-omap/dsp.h
	include/asm-arm/arch-omap/io.h
	include/asm-arm/arch-omap/mailbox.h
	include/asm-arm/arch-omap/omap24xx.h
---

30ef36b146be67d6985d5bdaf12d05a39e9a9fb4