Merge branch 'akpm/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 05:24:01 +0000 (16:24 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 05:24:01 +0000 (16:24 +1100)

Trivial merge