]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'misc' into for-next
authorJames Bottomley <JBottomley@Parallels.com>
Mon, 17 Sep 2012 12:36:03 +0000 (13:36 +0100)
committerJames Bottomley <JBottomley@Parallels.com>
Mon, 17 Sep 2012 12:36:03 +0000 (13:36 +0100)

Trivial merge