summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-08 19:30:19 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-08 19:30:19 -0800
commit2b876f95d03e226394b5d360c86127cbefaf614b (patch)
tree1f7ea2b85896bac5f5caecb6ff7a8c5d5262914f
parentfbf07eac7bf21c262143194181bd97c5d18b8ceb (diff)
parentc95b4502ad7fe8f3b9954aec794b00ac0046ab3a (diff)
parent6ce51c431019310ca03371355a4366c4649fa349 (diff)
downloadlinux-2b876f95d03e226394b5d360c86127cbefaf614b.tar.bz2
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