commit | 845199f194306dbd69ca42d3b40a5125cdb50b89 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 24 08:42:21 2008 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 24 08:42:21 2008 -0700 |
tree | efffb64ec9996578076682e53177dcff7f4a994c | |
parent | 38ccc197eb85cad594eb5863ba5a408655da0062 [diff] | |
parent | 0d626239ffe515a64a6b53c70896796f621c635c [diff] |
Merge branch 'irq-fixes-2' of git://git.kernel.org/pub/scm/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