Merge remote-tracking branch 'target-merge/for-next-merge'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 04:15:52 +0000 (15:15 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 04:15:52 +0000 (15:15 +1100)

Trivial merge