Merge branches 'audit', 'delay', 'dmaengine', 'fixes', 'misc' and 'sta2x11' into...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 9 Jul 2012 16:44:50 +0000 (17:44 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 9 Jul 2012 16:44:50 +0000 (17:44 +0100)

Trivial merge