Merge branch 'misc' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 12 Nov 2013 10:58:27 +0000 (10:58 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 12 Nov 2013 10:58:27 +0000 (10:58 +0000)

Trivial merge