]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1345851 3745033)
Merge branch 'timers/urgent' into timers/core
authorThomas Gleixner <tglx@linutronix.de>
Sun, 15 Jul 2012 08:24:53 +0000 (10:24 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Sun, 15 Jul 2012 08:24:53 +0000 (10:24 +0200)
commite6507ac63333faf03a7f9759f53f585e92829f3f
tree030d7ce20e8f8767d9423f78c102aba089eec372tree | snapshot
parent13458517037ba0a7af9d32126dbb319a6285c90fcommit | diff
parent3745033afa11d8a573de6a6e1c4368cd03061d6fcommit | diff
Merge branch 'timers/urgent' into timers/core

Reason: Update to upstream changes to avoid further conflicts.
Fixup a trivial merge conflict in kernel/time/tick-sched.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
kernel/time/tick-sched.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.