tree 1f7ea2b85896bac5f5caecb6ff7a8c5d5262914f
parent fbf07eac7bf21c262143194181bd97c5d18b8ceb
parent c95b4502ad7fe8f3b9954aec794b00ac0046ab3a
parent 6ce51c431019310ca03371355a4366c4649fa349
author Linus Torvalds <torvalds@linux-foundation.org> 1260329419 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1260329419 -0800

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