]> 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, 2 Sep 2012 08:30:56 +0000 (09:30 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 2 Sep 2012 08:30:56 +0000 (09:30 +0100)

Trivial merge