]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'fixes' into for-next
authorJames Bottomley <JBottomley@Parallels.com>
Wed, 25 Apr 2012 07:51:05 +0000 (08:51 +0100)
committerJames Bottomley <JBottomley@Parallels.com>
Wed, 25 Apr 2012 07:51:05 +0000 (08:51 +0100)

Trivial merge