git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f726a69
a018540
)
Merge branch 'linus' into timers/core
author
Ingo Molnar
<mingo@kernel.org>
Wed, 18 Jul 2012 09:24:41 +0000
(11:24 +0200)
committer
Ingo Molnar
<mingo@kernel.org>
Wed, 18 Jul 2012 09:25:55 +0000
(11:25 +0200)
Resolve semantic conflict in kernel/time/timekeeping.c.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff