projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 924412f 6b1859d)
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)
commite8b9dd7e2471b1274e3be719fcc385e0a710e46f
tree030d7ce20e8f8767d9423f78c102aba089eec372tree | snapshot (tar.gz zip)
parent924412f66fd9d21212e560a93792b0b607d46c6ecommit | diff
parent6b1859dba01c7d512b72d77e3fd7da8354235189commit | 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