]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'debug/dma-api' and 'arm/omap' into next
authorJoerg Roedel <joerg.roedel@amd.com>
Mon, 29 Aug 2011 10:39:31 +0000 (12:39 +0200)
committerJoerg Roedel <joerg.roedel@amd.com>
Mon, 29 Aug 2011 10:39:31 +0000 (12:39 +0200)

Trivial merge