]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'fixes' into for-next
authorJames Bottomley <JBottomley@Parallels.com>
Tue, 28 Feb 2012 15:55:03 +0000 (09:55 -0600)
committerJames Bottomley <JBottomley@Parallels.com>
Tue, 28 Feb 2012 15:55:03 +0000 (09:55 -0600)

Trivial merge