]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'misc' into for-next
authorJames Bottomley <JBottomley@Parallels.com>
Thu, 27 Jun 2013 03:37:09 +0000 (20:37 -0700)
committerJames Bottomley <JBottomley@Parallels.com>
Thu, 27 Jun 2013 03:37:09 +0000 (20:37 -0700)

Trivial merge