commit | 5fa2e1591300267b1e082c693d0b4da8e4943551 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Dec 06 17:50:07 2007 -0800 |
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Dec 06 17:50:07 2007 -0800 |
tree | f37a664a6cf23eda2441dea39a7e58de7b8965fe | |
parent | f194d132e4971111f85c18c96067acffb13cee6d [diff] | |
parent | 7cc955c8fdd58c5f2c98077011a20ce10897288c [diff] |
Merge branch 'merge' of master.kernel.org:/pub/scm/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.