]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
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)
Conflicts:

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

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

Simple merge
Simple merge