Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 10 Oct 2006 23:16:33 +0000 (16:16 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 10 Oct 2006 23:16:33 +0000 (16:16 -0700)
commit3c693024cffa5c96a20b969f4efd058675e7700f
tree2e49a90c3e67a898770fe0ea735d00326dbe3f69
parent107c3a73e0ee037322efa00fa3cb45b3b7eb6069
parent10270613fb4d5a44c335cfa13e9626bf5743c01d
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] Fix windfarm platform device usage
  [POWERPC] Fix i2c-powermac platform device usage
  [POWERPC] Fix secondary CPU startup on old "powersurge" SMP powermacs
  [POWERPC] ARCH=ppc pt_regs fixes
  [POWERPC] Update maple defconfig
  [POWERPC] Fix Maple secondary IDE interrupt
  [POWERPC] Make U4 PCIe work on maple
  [POWERPC] cell: fix default zImage build target
  [POWERPC] Fix boot wrapper invocation if CROSS_COMPILE contains spaces
  [POWERPC] Fix xmon IRQ handler for pt_regs removal