]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'devel-stable' and 'fixes' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 18 Sep 2013 10:02:43 +0000 (11:02 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 18 Sep 2013 10:02:43 +0000 (11:02 +0100)

Trivial merge