linux-next: manual merge of the mmc tree with Linus' tree

Hi Chris,

Today's linux-next merge of the mmc tree got a conflict in MAINTAINERS
between commit c2fd4e380322 ("MAINTAINERS: set up proper record for
Xilinx Zynq") from Linus' tree and commit 45f210424b4b ("mmc: arasan: Add
driver for Arasan SDHCI") from the mmc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).


-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc MAINTAINERS
index 64b39e610589,518bf717b02b..000000000000

--- a/MAINTAINERS
+++ b/MAINTAINERS

@@@ -1387,9 -1371,7 +1387,10 @@@ T:	git git://git.xilinx.com/linux-xlnx.
  S:	Supported
  F:	arch/arm/mach-zynq/
  F:	drivers/cpuidle/cpuidle-zynq.c
 +N:	zynq
 +N:	xilinx
 +F:	drivers/clocksource/cadence_ttc_timer.c
+ F:	drivers/mmc/host/sdhci-of-arasan.c
  
  ARM SMMU DRIVER
  M:	Will Deacon [off-list ref]

On Mon, Jan 13, 2014 at 01:17:00PM +1100, Stephen Rothwell wrote:

Hi Chris,

Today's linux-next merge of the mmc tree got a conflict in MAINTAINERS
between commit c2fd4e380322 ("MAINTAINERS: set up proper record for
Xilinx Zynq") from Linus' tree and commit 45f210424b4b ("mmc: arasan: Add
driver for Arasan SDHCI") from the mmc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

The fix is correct, AFAICT.

	Thanks,
	Sören