git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b8f6111
d6ad418
)
Merge branch 'fortglx/3.8/time' of git://git.linaro.org/people/jstultz/linux into...
author
Thomas Gleixner
<tglx@linutronix.de>
Wed, 21 Nov 2012 19:31:52 +0000
(20:31 +0100)
committer
Thomas Gleixner
<tglx@linutronix.de>
Wed, 21 Nov 2012 19:31:52 +0000
(20:31 +0100)
Fix trivial conflicts in: kernel/time/tick-sched.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff