From: Tony Lindgren <tony@atomide.com>
Date: Thu, 3 Sep 2009 21:02:11 +0000 (-0700)
Subject: Merge branch 'for-next'
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~25
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3dff8750255bf5a1e9a69931b1d8739a65a933d0;p=pandora-kernel.git

Merge branch 'for-next'

Conflicts:
	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-generic.c
	arch/arm/mach-omap2/board-h4.c
	arch/arm/mach-omap2/board-ldp.c
	arch/arm/mach-omap2/board-omap3evm.c
	arch/arm/mach-omap2/board-zoom2.c
	arch/arm/mach-omap2/mux.c
	arch/arm/mach-omap2/pm-debug.c
	arch/arm/plat-omap/include/mach/mux.h
---

3dff8750255bf5a1e9a69931b1d8739a65a933d0
Reading git-diff-tree failed