Commit 5d9dc2cf authored by Jens Axboe's avatar Jens Axboe

Merge branch 'for-linus' of...

Merge branch 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 into sg
parents 3d1266c7 18ccc419
......@@ -3,7 +3,7 @@
#include <linux/mm.h>
#include <linux/device.h>
#include <asm/scatterlist.h>
#include <linux/scatterlist.h>
#include <asm/processor.h>
#include <asm/cacheflush.h>
#include <asm/io.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