commit | 1bbc9a66d0194449f32c2aa18be40db5744dbd85 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Nov 05 13:22:49 2009 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Nov 05 13:22:49 2009 -0800 |
tree | 05c2efbd2cc8058ca1318fea2875880150b69d54 | |
parent | 2c75910f1aa042be1dd769378d2611bf551721ac [diff] | |
parent | 38634e6769920929385f1ffc8820dc3e893cc630 [diff] |
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/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