git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 423145a fa4e998)
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


Trivial merge
Pandora Kernel Repository