Merge branch 'irq-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Apr 2008 15:42:21 +0000 (08:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Apr 2008 15:42:21 +0000 (08:42 -0700)
commit845199f194306dbd69ca42d3b40a5125cdb50b89
treeefffb64ec9996578076682e53177dcff7f4a994c
parent38ccc197eb85cad594eb5863ba5a408655da0062
parent0d626239ffe515a64a6b53c70896796f621c635c
Merge branch 'irq-fixes-2' of git://git./linux/kernel/git/jgarzik/misc-2.6

* 'irq-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  arm/mach-integrator/time.c, mwave: revert portions of recent irq cleanups