Merge branches 'amba', 'devel-stable', 'fixes', 'mach-types', 'mmci', 'pci' and ...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 21 May 2012 14:15:10 +0000 (15:15 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 21 May 2012 14:15:10 +0000 (15:15 +0100)

Trivial merge