Merge branches 'debug-choice', 'devel-stable' and 'misc' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 5 Sep 2013 09:34:15 +0000 (10:34 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 5 Sep 2013 09:34:15 +0000 (10:34 +0100)

Trivial merge