Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 23 Mar 2009 15:03:09 +0000 (08:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 23 Mar 2009 15:03:09 +0000 (08:03 -0700)
commitb0dcb4a91ddb79f2e213205cf8d86b467f8559c7
tree4e39332805ae940963bf09efd22c6949bbe793b6
parent59fcbddaff6f862cc1584b488866d9c4a5579085
parent345953cf9a44b19c98f8c0fe6ca7724202bcdb94
Merge branch 'merge' of git://git./linux/kernel/git/galak/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc:
  powerpc/mm: Fix Respect _PAGE_COHERENT on classic ppc32 SW TLB load machines