| commit | 22b61a11fd4e6d7a48d694ce350331bebc0394ed | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | Sat Feb 21 21:42:50 2009 +0000 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Sat Feb 21 21:42:50 2009 +0000 |
| tree | f4be46c8154f5094c248fcd9fdf644b236f591b3 | |
| parent | 423145a5d4def58cff760809d48cfb21316d59a9 [diff] | |
| parent | fa4e998999322bc1b11d2c8b19b9fa2016fd1548 [diff] |
Merge branch 'dma' into devel Conflicts: arch/arm/plat-mxc/dma-mx1-mx2.c