]> 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>
Tue, 6 Dec 2011 12:58:49 +0000 (12:58 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 6 Dec 2011 12:58:49 +0000 (12:58 +0000)

Trivial merge