From: Tony Lindgren <tony@atomide.com>
Date: Fri, 3 Apr 2009 00:10:56 +0000 (-0700)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.32-omap1~11^2^2~1^2^2^2^2^2~8^2^2~18^2~2^2^2~2^2^2^2^2~16^2^2~8^2^2~7^2~187
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0595ee8a05836666b225e6bf003ede0da1e6e329;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:
	arch/arm/configs/omap_3430sdp_defconfig
	arch/arm/configs/rx51_defconfig
	arch/arm/mach-omap2/Kconfig
	arch/arm/mach-omap2/Makefile
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/mach-omap2/board-3430sdp.c
	arch/arm/mach-omap2/board-apollon.c
	arch/arm/mach-omap2/board-h4.c
	arch/arm/mach-omap2/board-ldp.c
	arch/arm/mach-omap2/board-omap3beagle.c
	arch/arm/mach-omap2/board-omap3pandora.c
	arch/arm/mach-omap2/board-overo.c
	arch/arm/mach-omap2/board-rx51-peripherals.c
	arch/arm/mach-omap2/board-rx51.c
	arch/arm/mach-omap2/mmc-twl4030.c
	arch/arm/mach-omap2/mmc-twl4030.h
	arch/arm/mach-omap2/usb-musb.c
	arch/arm/plat-omap/dma.c
	arch/arm/plat-omap/include/mach/board-nokia.h
	arch/arm/plat-omap/include/mach/irqs.h
	arch/arm/plat-omap/include/mach/usb.h
	drivers/Makefile
	drivers/i2c/chips/Kconfig
	drivers/video/omap/omapfb_main.c
	net/ipv4/netfilter/Makefile
---

0595ee8a05836666b225e6bf003ede0da1e6e329
Reading git-diff-tree failed