git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3561d43
d3b8f88
)
Merge remote branch 'tip/x86/tsc' into fortglx/2.6.38/tip/x86/tsc
author
John Stultz
<john.stultz@linaro.org>
Fri, 3 Dec 2010 00:47:52 +0000
(16:47 -0800)
committer
John Stultz
<john.stultz@linaro.org>
Fri, 3 Dec 2010 00:47:52 +0000
(16:47 -0800)
Conflicts:
Documentation/kernel-parameters.txt
Trivial merge