From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 9 Dec 2009 03:30:19 +0000 (-0800)
Subject: Merge branches 'timers-for-linus-ntp' and 'irq-core-for-linus' of git://git.kernel... 
X-Git-Tag: v2.6.33-rc1~361
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b876f95d03e226394b5d360c86127cbefaf614b;p=pandora-kernel.git

Merge branches 'timers-for-linus-ntp' and 'irq-core-for-linus' of git://git./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
---

2b876f95d03e226394b5d360c86127cbefaf614b
Reading git-diff-tree failed