Merge branches 'debug/dma-api', 'arm/omap', 'arm/msm' and 'core' into api-2
authorJoerg Roedel <joerg.roedel@amd.com>
Tue, 6 Sep 2011 12:59:21 +0000 (14:59 +0200)
committerJoerg Roedel <joerg.roedel@amd.com>
Tue, 6 Sep 2011 12:59:21 +0000 (14:59 +0200)

Trivial merge