commit 86c65a7857896b1de99628ad392556965c4841e6
author Linus Torvalds <torvalds@linux-foundation.org> Fri Jul 23 13:26:16 2010 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Fri Jul 23 13:26:16 2010 -0700
tree 8cb153af048348261f7244600076a44354ec94c9
parent 20a52d4f5998f4804af7c27651490647da62fd08
parent 7ffb65f84bd3852e4906c43b9e84dcc4e4d72d14

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:
  vmlinux.lds: fix .data..init_task output section (fix popwerpc boot)
  powerpc: Fix erroneous lmb->memblock conversions
  powerpc/mm: Add some debug output when hash insertion fails
  powerpc/mm: Fix bugs in huge page hashing
  powerpc/mm: Move around testing of _PAGE_PRESENT in hash code
  powerpc/mm: Handle hypervisor pte insert failure in __hash_page_huge
  powerpc/kexec: Fix boundary case for book-e kexec memory limits