Merge commit 'upstream/master'

diff --cc arch/avr32/mach-at32ap/at32ap700x.c
Simple merge

diff --cc drivers/mmc/host/atmel-mci.c
index c2f8aa840e82e30259654a66f1e82525b4cb2050,b68381f7bfdd504e3f786675be6930626eb33ed2..82bbbe99816920eb182443e8eff375f03698473c
--- 1/drivers/mmc/host/atmel-mci.c
--- 2/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@@ -9,8 -9,8 +9,9 @@@
   */
  #include <linux/blkdev.h>
  #include <linux/clk.h>
+ #include <linux/debugfs.h>
  #include <linux/device.h>
 +#include <linux/err.h>
  #include <linux/init.h>
  #include <linux/interrupt.h>
  #include <linux/ioport.h>

diff --cc include/asm-avr32/arch-at32ap/board.h
Simple merge