]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'dma' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 21 Feb 2009 21:42:50 +0000 (21:42 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 21 Feb 2009 21:42:50 +0000 (21:42 +0000)
commit22b61a11fd4e6d7a48d694ce350331bebc0394ed
treef4be46c8154f5094c248fcd9fdf644b236f591b3
parent423145a5d4def58cff760809d48cfb21316d59a9
parentfa4e998999322bc1b11d2c8b19b9fa2016fd1548
Merge branch 'dma' into devel

Conflicts:

arch/arm/plat-mxc/dma-mx1-mx2.c
arch/arm/mach-footbridge/dma.c
arch/arm/plat-mxc/dma-mx1-mx2.c