Merge branch 'fixes' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 5 Oct 2012 23:19:06 +0000 (00:19 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 5 Oct 2012 23:19:06 +0000 (00:19 +0100)

Trivial merge