Commit cbc74951 authored by Linus Torvalds's avatar Linus Torvalds

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

parents 71f95cfb 69177e89
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <asm/div64.h> #include <asm/div64.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h>
#include <asm/scatterlist.h> #include <asm/scatterlist.h>
#include <asm/sizes.h> #include <asm/sizes.h>
#include <asm/hardware/amba.h> #include <asm/hardware/amba.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment