projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fbf07ea c95b450 6ce51c4)
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)
commit2b876f95d03e226394b5d360c86127cbefaf614b
tree1f7ea2b85896bac5f5caecb6ff7a8c5d5262914ftree | snapshot
parentfbf07eac7bf21c262143194181bd97c5d18b8cebcommit | diff
parentc95b4502ad7fe8f3b9954aec794b00ac0046ab3acommit | diff
parent6ce51c431019310ca03371355a4366c4649fa349commit | diff
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
include/linux/timex.h diff1 | diff2 | diff3 | blob | history
kernel/irq/manage.c diff1 | diff2 | diff3 | blob | history
Domain: System / Kernel;