Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
commiteef70b217a7ab46e8e0cf75982ad75d8305d5591
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Dec 2008 17:47:43 +0000 (16 09:47 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Dec 2008 17:47:43 +0000 (16 09:47 -0800)
tree85d34903a74f2581ac0e67d8e16e5c02855f37cd
parentc095adbc211f9f4e990eac7d6cb440de35e4f05f
parent23e0e8afafd9ac065d81506524adf3339584044b
Merge branch 'merge' of git://git./linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  powerpc/cell/axon-msi: Fix MSI after kexec
  powerpc: Fix bootmem reservation on uninitialized node
  powerpc: Check for valid hugepage size in hugetlb_get_unmapped_area