Merge remote-tracking branch 'benh/next' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Tue, 2 Dec 2014 03:19:20 +0000 (14:19 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Tue, 2 Dec 2014 03:19:20 +0000 (14:19 +1100)
Merge updates collected & acked by Ben. A few EEH patches from Gavin,
some mm updates from Aneesh and a few odds and ends.

1  2 
arch/powerpc/mm/hugetlbpage.c

Simple merge