Merge branch 'pending-dma-streaming' (early part) into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 4 Dec 2009 15:00:08 +0000 (15:00 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 4 Dec 2009 15:00:11 +0000 (15:00 +0000)
1  2 
arch/arm/include/asm/memory.h

Simple merge