From: Linus Torvalds <torvalds@woody.linux-foundation.org>
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-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=5fa2e1591300267b1e082c693d0b4da8e4943551;p=openwrt%2Fstaging%2Fblogic.git

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.
---

5fa2e1591300267b1e082c693d0b4da8e4943551