]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'fixes' and 'misc' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 15 Aug 2012 09:48:32 +0000 (10:48 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 15 Aug 2012 09:48:32 +0000 (10:48 +0100)

Trivial merge