From: Tony Lindgren <tony@atomide.com>
Date: Mon, 16 Apr 2007 20:59:12 +0000 (+0000)
Subject: Merge omap-drivers
X-Git-Tag: v2.6.21-omap1~32
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fcc317e73c1070abf8134fd0b48ab5c4ab109ccd;p=pandora-kernel.git

Merge omap-drivers

Conflicts:

	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/Kconfig
	arch/arm/mach-omap2/Makefile
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/mach-omap2/board-h4.c
	arch/arm/mach-omap2/board-n800-dsp.c
	arch/arm/mach-omap2/board-n800-usb.c
	arch/arm/plat-omap/Kconfig
	arch/arm/plat-omap/Makefile
	arch/arm/plat-omap/devices.c
	drivers/Makefile
	drivers/i2c/chips/gpio_expander_omap.c
	drivers/i2c/chips/menelaus.c
	drivers/i2c/chips/tlv320aic23.c
	drivers/mtd/onenand/omap2.c
	drivers/video/omap/omapfb_main.c
	include/asm-arm/arch-omap/dsp.h
	include/asm-arm/hardware/tsc2101.h
	net/ipv4/netfilter/ipt_IDLETIMER.c
---

fcc317e73c1070abf8134fd0b48ab5c4ab109ccd
Reading git-diff-tree failed