]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'fortglx/3.8/time' of git://git.linaro.org/people/jstultz/linux into...
authorThomas Gleixner <tglx@linutronix.de>
Wed, 21 Nov 2012 19:31:52 +0000 (20:31 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 21 Nov 2012 19:31:52 +0000 (20:31 +0100)
commit3b25687ed88218ad66637ac28a638e76c804e179
treee9f3d68e0019a47b982e2b8644f70eb66a3eff3c
parent76af4ef5dd0b39ee8a4f36f06538129c85ae812b
parent01068e89f434b86e99ec17b11045a0bc3715404d
Merge branch 'fortglx/3.8/time' of git://git.linaro.org/people/jstultz/linux into timers/core

Fix trivial conflicts in: kernel/time/tick-sched.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
kernel/time/tick-sched.c