Merge master.kernel.org:/home/rmk/linux-2.6-arm

diff --cc drivers/mmc/mmci.c
index 2b10a2d4ae099f9a7c1d44829c54b80431c862f4,a0cd916ab7920805da9edcefd7ba6a34b5d25ed1..634ef53e85a50e63bbb52a5ae3008c7297a73f5d
--- 1/drivers/mmc/mmci.c
--- 2/drivers/mmc/mmci.c
+++ b/drivers/mmc/mmci.c
@@@ -19,8 -19,9 +19,10 @@@
  #include <linux/highmem.h>
  #include <linux/mmc/host.h>
  #include <linux/mmc/protocol.h>
+ #include <linux/amba/bus.h>
+ #include <linux/clk.h>
  
 +#include <asm/cacheflush.h>
  #include <asm/div64.h>
  #include <asm/io.h>
  #include <asm/scatterlist.h>