]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'timers-for-linus-ntp' and 'irq-core-for-linus' of git://git.kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Dec 2009 03:30:19 +0000 (19:30 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Dec 2009 03:30:19 +0000 (19:30 -0800)
commitf1b4b05fd49230caf54a22845feb178d06a850e5
tree1f7ea2b85896bac5f5caecb6ff7a8c5d5262914f
parentd1844b790a33a705569ba5889ea0439ab7161c7d
parent065b3273b98762e1ea597ba0e265f9f0c2da673c
parentafb0b5c37387f4a9a8d8ffb6d0d4a40ad5575cbc
Merge branches 'timers-for-linus-ntp' and 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-for-linus-ntp' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  ntp: Provide compability defines (You say MOD_NANO, I say ADJ_NANO)

* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  genirq: do not execute DEBUG_SHIRQ when irq setup failed
include/linux/timex.h
kernel/irq/manage.c