Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d9dc2cf authored Oct 24, 2007 by 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

include/asm-avr32/dma-mapping.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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>