Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 7 Dec 2007 01:50:07 +0000 (17:50 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 7 Dec 2007 01:50:07 +0000 (17:50 -0800)
commit5fa2e1591300267b1e082c693d0b4da8e4943551
treef37a664a6cf23eda2441dea39a7e58de7b8965fe
parentf194d132e4971111f85c18c96067acffb13cee6d
parent7cc955c8fdd58c5f2c98077011a20ce10897288c
Merge branch 'merge' of /linux/kernel/git/paulus/powerpc

* 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] virtex bug fix: Use canonical value for AC97 interrupt xparams
  [POWERPC] Update defconfigs
  [POWERPC] PS3: Update ps3_defconfig
  [POWERPC] Update iseries_defconfig
  [POWERPC] Fix hardware IRQ time accounting problem.