]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'fixes' into for-next
authorJames Bottomley <JBottomley@Parallels.com>
Fri, 14 Sep 2012 17:02:27 +0000 (18:02 +0100)
committerJames Bottomley <JBottomley@Parallels.com>
Fri, 14 Sep 2012 17:02:27 +0000 (18:02 +0100)

Trivial merge