From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Nov 2009 21:22:49 +0000 (-0800)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
X-Git-Tag: v2.6.32-rc7~69
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1bbc9a66d0194449f32c2aa18be40db5744dbd85;p=platform%2Fkernel%2Flinux-3.10.git

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/kvm: Remove problematic BUILD_BUG_ON statement
  powerpc/pci: Fix regression in powerpc MSI-X
  powerpc: Avoid giving out RTC dates below EPOCH
  powerpc/mm: Remove debug context clamping from nohash code
  powerpc: Cleanup Kconfig selection of hugetlbfs support
---

1bbc9a66d0194449f32c2aa18be40db5744dbd85