From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 Apr 2008 15:42:21 +0000 (-0700)
Subject: Merge branch 'irq-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.26-rc1~1086
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=845199f194306dbd69ca42d3b40a5125cdb50b89

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

845199f194306dbd69ca42d3b40a5125cdb50b89