Merge tag 'powerpc-4.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc fixes from Michael Ellerman:
 - Fix for dynticks.
 - Fix for smpboot bug.
 - Fix for IOMMU group refcounting.

* tag 'powerpc-4.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
  powerpc/iommu: Remove IOMMU device references via bus notifier
  powerpc/smp: Wait until secondaries are active & online
  powerpc: Re-enable dynticks

diff --cc arch/powerpc/include/asm/iommu.h
Simple merge

diff --cc arch/powerpc/include/asm/irq_work.h
Simple merge

diff --cc arch/powerpc/kernel/iommu.c
Simple merge

diff --cc arch/powerpc/kernel/smp.c
Simple merge

diff --cc arch/powerpc/platforms/powernv/pci.c
Simple merge

diff --cc arch/powerpc/platforms/pseries/iommu.c
Simple merge