git » linux-kernel » commit b4297b0

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

author Linus Torvalds
2009-11-30 22:49:39 UTC
committer Linus Torvalds
2009-11-30 22:49:39 UTC
parent a8a84540eb3fd0493f250dc1c513bef6810a50fd
parent e8105903d78c81119754a42926951d9d17e191ba
Merge branch 'merge' of git://git.kernel.org/pub/scm/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