Merge commit 'upstream/master'
Haavard Skinnemoen [Sun, 27 Jul 2008 11:54:08 +0000 (13:54 +0200)]
1  2 
arch/avr32/mach-at32ap/at32ap700x.c
drivers/mmc/host/atmel-mci.c
include/asm-avr32/arch-at32ap/board.h

Simple merge
@@@ -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>
Simple merge