git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a903743
6f16eeb
)
Merge branch 'fortglx/3.9/time' of git://git.linaro.org/people/jstultz/linux into...
author
Thomas Gleixner
<tglx@linutronix.de>
Mon, 4 Feb 2013 10:03:03 +0000
(11:03 +0100)
committer
Thomas Gleixner
<tglx@linutronix.de>
Mon, 4 Feb 2013 10:03:03 +0000
(11:03 +0100)
Trivial conflict in arch/x86/Kconfig
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff