git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f3f3149
543cf4c
)
Merge branch 'linus' into x86/delay
author
Ingo Molnar
<mingo@elte.hu>
Wed, 25 Jun 2008 10:30:10 +0000
(12:30 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Wed, 25 Jun 2008 10:30:10 +0000
(12:30 +0200)
Conflicts:
arch/x86/kernel/tsc_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff