From: Tony Lindgren <tony@atomide.com>
Date: Wed, 7 Mar 2007 11:49:42 +0000 (-0800)
Subject: Merge omap-drivers
X-Git-Tag: v2.6.21-omap1~91
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=874e3eae2c304343a5c98c337dc345950a592815;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-omap2/Makefile
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/mach-omap2/board-n800-flash.c
	arch/arm/plat-omap/Kconfig
	arch/arm/plat-omap/Makefile
	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
	drivers/Makefile
	include/asm-arm/arch-omap/dsp.h
	include/asm-arm/arch-omap/mailbox.h
	include/asm-arm/arch-omap/onenand.h
---

874e3eae2c304343a5c98c337dc345950a592815