Merge branch 'fixes' into for-next
authorJames Bottomley <JBottomley@Odin.com>
Tue, 27 Oct 2015 06:04:46 +0000 (15:04 +0900)
committerJames Bottomley <JBottomley@Odin.com>
Tue, 27 Oct 2015 06:04:46 +0000 (15:04 +0900)

Trivial merge