Merge branches 'dmaengine', 'fixes', 'misc' and 'sta2x11' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 5 Jul 2012 12:55:22 +0000 (13:55 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 5 Jul 2012 12:55:22 +0000 (13:55 +0100)

Trivial merge