Merge remote-tracking branch 'hsi/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 03:33:41 +0000 (14:33 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 03:33:41 +0000 (14:33 +1100)

Trivial merge