From: Tony Lindgren <tony@atomide.com>
Date: Mon, 29 Oct 2007 11:50:40 +0000 (-0700)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.24-omap1~260
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19ea3371abfff6bbfa8ef72b50aba042fd26be6b;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

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-h3.c
	arch/arm/mach-omap1/board-nokia770.c
	arch/arm/mach-omap1/board-palmte.c
	arch/arm/mach-omap1/board-palmtt.c
	arch/arm/mach-omap1/board-palmz71.c
	arch/arm/mach-omap1/board-sx1.c
	arch/arm/mach-omap2/Kconfig
	arch/arm/mach-omap2/Makefile
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/mach-omap2/board-apollon.c
	arch/arm/mach-omap2/board-h4.c
	arch/arm/mach-omap2/devices.c
	arch/arm/mach-omap2/gpmc.c
	arch/arm/mach-omap2/id.c
	arch/arm/mach-omap2/io.c
	arch/arm/mach-omap2/irq.c
	arch/arm/mach-omap2/memory.c
	arch/arm/mach-omap2/mux.c
	arch/arm/mach-omap2/pm.c
	arch/arm/nwfpe/entry.S
	arch/arm/plat-omap/Makefile
	drivers/char/watchdog/omap_wdt.c
	drivers/char/watchdog/omap_wdt.h
	drivers/i2c/busses/i2c-omap.c
	drivers/i2c/chips/menelaus.c
	drivers/input/keyboard/Kconfig
	drivers/input/keyboard/Makefile
	drivers/media/video/Kconfig
	drivers/media/video/Makefile
	drivers/media/video/tcm825x.c
	drivers/media/video/v4l2-int-device.c
	drivers/mtd/onenand/onenand_base.c
	drivers/usb/gadget/Kconfig
	drivers/video/Makefile
	include/asm-arm/arch-omap/board-2430sdp.h
	include/asm-arm/arch-omap/hardware.h
	include/asm-arm/arch-omap/io.h
	include/asm-arm/arch-omap/omap24xx.h
	include/linux/connector.h
---

19ea3371abfff6bbfa8ef72b50aba042fd26be6b
Reading git-diff-tree failed