]> rtime.felk.cvut.cz Git - lisovros/linux_canprio.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-genirq
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 19 Feb 2008 15:54:02 +0000 (07:54 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 19 Feb 2008 15:54:02 +0000 (07:54 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-genirq:
  genirq: do not leave interupts enabled on free_irq
  genirq: spurious.c: use time_* macros


Trivial merge