Merge remote-tracking branch 'berlin/berlin/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Nov 2015 23:15:00 +0000 (10:15 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Nov 2015 23:15:00 +0000 (10:15 +1100)

Trivial merge