git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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>

Trivial merge
Pandora Kernel Repository