]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'misc' into for-next
authorJames Bottomley <JBottomley@Parallels.com>
Mon, 23 Apr 2012 22:21:05 +0000 (23:21 +0100)
committerJames Bottomley <JBottomley@Parallels.com>
Mon, 23 Apr 2012 22:21:05 +0000 (23:21 +0100)

Trivial merge