git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
34646bc
5b664cb
)
Merge branch 'linus' into x86/paravirt-spinlocks
author
Ingo Molnar
<mingo@elte.hu>
Fri, 18 Jul 2008 11:41:27 +0000
(13:41 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Fri, 18 Jul 2008 11:41:27 +0000
(13:41 +0200)
Conflicts:
arch/x86/kernel/Makefile
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge