From: Tony Lindgren <tony@atomide.com>
Date: Wed, 17 Oct 2012 18:07:18 +0000 (-0700)
Subject: Merge branch 'omap-for-v3.8/cleanup-headers-gpmc' into omap-for-v3.8/cleanup-headers
X-Git-Tag: omap-for-v3.8/cleanup-headers-signed~21
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99f0b8d6b09b0db6452d0d6e252bfa28049bbea9;p=pandora-kernel.git

Merge branch 'omap-for-v3.8/cleanup-headers-gpmc' into omap-for-v3.8/cleanup-headers

Conflicts:
	arch/arm/mach-omap2/board-3430sdp.c
	arch/arm/mach-omap2/board-h4.c
	arch/arm/mach-omap2/board-rx51-peripherals.c
	arch/arm/mach-omap2/board-rx51.c
	arch/arm/mach-omap2/pm34xx.c
	drivers/mtd/nand/omap2.c
	drivers/mtd/onenand/omap2.c
---

99f0b8d6b09b0db6452d0d6e252bfa28049bbea9
Reading git-diff-tree failed