From: Linus Torvalds Date: Fri, 7 Dec 2007 01:50:07 +0000 (-0800) Subject: Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc X-Git-Tag: v2.6.24-rc5~55 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fa2e1591300267b1e082c693d0b4da8e4943551;p=linux-2.6 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. --- 5fa2e1591300267b1e082c693d0b4da8e4943551