From: Tony Lindgren <tony@atomide.com>
Date: Tue, 8 May 2007 00:08:50 +0000 (-0700)
Subject: Merge omap-drivers
X-Git-Tag: v2.6.22-omap1~180
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5abf13bcd0616da8ba00a2438780e0054c935c16;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-omap1/board-palmte.c
	arch/arm/mach-omap1/time.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-audio.c
	arch/arm/mach-omap2/board-n800-dsp.c
	arch/arm/mach-omap2/board-n800-usb.c
	arch/arm/mach-omap2/devices.c
	arch/arm/mach-omap2/pm.c
	arch/arm/plat-omap/Kconfig
	arch/arm/plat-omap/Makefile
	arch/arm/plat-omap/common.c
	arch/arm/plat-omap/devices.c
	arch/arm/plat-omap/gpio.c
	arch/arm/plat-omap/timer32k.c
	drivers/Makefile
	drivers/i2c/chips/gpio_expander_omap.c
	drivers/i2c/chips/menelaus.c
	drivers/i2c/chips/tlv320aic23.c
	drivers/input/keyboard/Kconfig
	drivers/input/keyboard/Makefile
	drivers/mtd/onenand/omap2.c
	drivers/video/omap/lcdc.c
	drivers/video/omap/omapfb_main.c
	include/asm-arm/arch-omap/dsp.h
	include/asm-arm/arch-omap/eac.h
	include/asm-arm/arch-omap/gpio.h
	include/asm-arm/arch-omap/omap24xx.h
	include/asm-arm/arch-omap/onenand.h
	include/asm-arm/hardware/tsc2101.h
	net/ipv4/netfilter/Kconfig
	net/ipv4/netfilter/Makefile
	net/ipv4/netfilter/ipt_IDLETIMER.c
---

5abf13bcd0616da8ba00a2438780e0054c935c16
Reading git-diff-tree failed