From: David Woodhouse <David.Woodhouse@intel.com>
Date: Tue, 9 Oct 2012 14:03:21 +0000 (+0100)
Subject: Merge tag 'disintegrate-mtd-20121009' of git://git.infradead.org/users/dhowells/linux... 
X-Git-Tag: v3.7-rc1~70^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffe315012510165ce82e4dd4767f0a5dba9edbf7;p=pandora-kernel.git

Merge tag 'disintegrate-mtd-20121009' of git://git.infradead.org/users/dhowells/linux-headers

UAPI Disintegration 2012-10-09

Conflicts:
	MAINTAINERS
	arch/arm/configs/bcmring_defconfig
	arch/arm/mach-imx/clk-imx51-imx53.c
	drivers/mtd/nand/Kconfig
	drivers/mtd/nand/bcm_umi_nand.c
	drivers/mtd/nand/nand_bcm_umi.h
	drivers/mtd/nand/orion_nand.c
---

ffe315012510165ce82e4dd4767f0a5dba9edbf7
Reading git-diff-tree failed