From: Tony Lindgren <tony@atomide.com>
Date: Mon, 11 Aug 2008 14:16:24 +0000 (+0300)
Subject: Merge mainline v2.6.27-rc2 tree into linux-omap tree
X-Git-Tag: v2.6.27-omap1~329
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5061bcd119547453b32c847d2b9490a052bc1755;p=pandora-kernel.git

Merge mainline v2.6.27-rc2 tree into linux-omap tree

Merge branch 'master'; commit 'linus'

Conflicts:

	arch/arm/mach-omap1/board-nokia770.c
	arch/arm/mach-omap1/mcbsp.c
	arch/arm/mach-omap2/Makefile
	arch/arm/mach-omap2/board-apollon.c
	arch/arm/mach-omap2/clock.c
	arch/arm/mach-omap2/clock.h
	arch/arm/mach-omap2/clock24xx.c
	arch/arm/mach-omap2/clock24xx.h
	arch/arm/mach-omap2/clock34xx.c
	arch/arm/mach-omap2/clock34xx.h
	arch/arm/mach-omap2/id.c
	arch/arm/mach-omap2/mcbsp.c
	arch/arm/mach-omap2/memory.c
	arch/arm/mach-omap2/pm.c
	arch/arm/mach-omap2/prm.h
	arch/arm/mach-omap2/sram242x.S
	arch/arm/mach-omap2/sram243x.S
	arch/arm/plat-omap/common.c
	arch/arm/plat-omap/devices.c
	arch/arm/plat-omap/mcbsp.c
	arch/arm/plat-omap/sram.c
	drivers/i2c/busses/Kconfig
	drivers/i2c/chips/isp1301_omap.c
	drivers/input/touchscreen/Kconfig
	drivers/misc/Makefile
	drivers/mtd/nand/Makefile
	drivers/net/Kconfig
	drivers/net/smc911x.h
	drivers/power/Kconfig
	drivers/power/Makefile
	drivers/usb/gadget/omap_udc.c
	include/asm-arm/arch-omap/board-2430sdp.h
	include/asm-arm/arch-omap/board.h
	include/asm-arm/arch-omap/clock.h
	include/asm-arm/arch-omap/common.h
	include/asm-arm/arch-omap/hardware.h
	include/asm-arm/arch-omap/io.h
	include/asm-arm/arch-omap/mcbsp.h
	include/asm-arm/arch-omap/omap34xx.h
	include/asm-arm/arch-omap/sram.h
	include/asm-arm/cpu-multi32.h
	include/asm-arm/pgtable.h
	include/asm-arm/setup.h
	include/linux/i2c-id.h
	kernel/printk.c
	security/Makefile
	sound/arm/Kconfig
---

5061bcd119547453b32c847d2b9490a052bc1755
Reading git-diff-tree failed