Linus Torvalds 82aff107f8 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: (152 commits) powerpc: Fix hard CPU IDs detection powerpc/pmac: Update via-pmu to new syscore_ops powerpc/kvm: Fix the build for 32-bit Book 3S (classic) processors powerpc/kvm: Fix kvmppc_core_pending_dec powerpc: Remove last piece of GEMINI powerpc: Fix for Pegasos keyboard and mouse powerpc: Make early memory scan more resilient to out of order nodes powerpc/pseries/iommu: Cleanup ddw naming powerpc/pseries/iommu: Find windows after kexec during boot powerpc/pseries/iommu: Remove ddw property when destroying window powerpc/pseries/iommu: Add additional checks when changing iommu mask powerpc/pseries/iommu: Use correct return type in dupe_ddw_if_already_created powerpc: Remove unused/obsolete CONFIG_XICS misc: Add CARMA DATA-FPGA Programmer support misc: Add CARMA DATA-FPGA Access Driver powerpc: Make IRQ_NOREQUEST last to clear, first to set powerpc: Integrated Flash controller device tree bindings powerpc/85xx: Create dts of each core in CAMP mode for P1020RDB powerpc/85xx: Fix PCIe IDSEL for Px020RDB powerpc/85xx: P2020 DTS: re-organize dts files ...		2011-05-20 13:28:01 -07:00
..
boot	Merge remote branch 'kumar/next' into next	2011-05-20 13:43:47 +10:00
configs	Merge remote branch 'kumar/next' into next	2011-05-20 13:43:47 +10:00
include/asm	Merge remote branch 'origin/master' into merge	2011-05-20 15:36:52 +10:00
kernel	powerpc: Fix hard CPU IDs detection	2011-05-20 17:50:18 +10:00
kvm	powerpc/kvm: Fix the build for 32-bit Book 3S (classic) processors	2011-05-20 13:43:41 +10:00
lib	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2011-05-20 13:28:01 -07:00
math-emu
mm
oprofile
platforms	Merge remote branch 'origin/master' into merge	2011-05-20 15:36:52 +10:00
sysdev	Merge remote branch 'origin/master' into merge	2011-05-20 15:36:52 +10:00
xmon
Kconfig
Kconfig.debug
Makefile
relocs_check.pl