Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Nov 2009 22:49:39 +0000 (14:49 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Nov 2009 22:49:39 +0000 (14:49 -0800)
commitb4297b01198bc2501038bb463b6631f6f3782cc0
tree2d4db2c7d7430347bbe1a17e53acb7d376bfd4c3
parenta8a84540eb3fd0493f250dc1c513bef6810a50fd
parente8105903d78c81119754a42926951d9d17e191ba
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: Fix DEBUG_HIGHMEM build break from d4515646699