Merge branches 'devel-stable', 'entry', 'fixes', 'mach-types', 'misc' and 'smp-hotplu...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 2 May 2013 20:30:36 +0000 (21:30 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 2 May 2013 20:30:36 +0000 (21:30 +0100)

Trivial merge