]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branches 'fixes' and 'misc' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 11 Dec 2011 09:58:32 +0000 (09:58 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 11 Dec 2011 09:58:32 +0000 (09:58 +0000)

Trivial merge