Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Feb 2009 16:21:11 +0000 (08:21 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Feb 2009 16:21:11 +0000 (08:21 -0800)
commitda8dbb88db2af1e963090bd549a9a7dccffe991c
tree3d4be20db11a546c59f78cef8a6962cc0c7d13ed
parent1385a7ae654264fb2d9d3c6c3c7a3df28d29ab53
parentf99fb8a2cbf0fd9ce9b2d5d298943d0d4dc479f7
Merge branch 'merge' of git://git./linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/mm: Fix _PAGE_COHERENT support on classic ppc32 HW