projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b8f6111 d6ad418)
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)
commit9c3f9e281697d02889c3b08922f3b30be75f56c2
treee9f3d68e0019a47b982e2b8644f70eb66a3eff3ctree | snapshot (tar.gz zip)
parentb8f61116c1ce342804a0897b0a80eb4df5f19453commit | diff
parentd6ad418763888f617ac5b4849823e4cd670df1ddcommit | diff
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 diff1 | diff2 | blob | history
Motorola kernel-slsi