git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1fa246d
ad010c5
)
Merge remote-tracking branch 'idle-test/idle-test'
author
Stephen Rothwell
<sfr@canb.auug.org.au>
Mon, 30 May 2011 02:04:12 +0000
(12:04 +1000)
committer
Stephen Rothwell
<sfr@canb.auug.org.au>
Mon, 30 May 2011 02:04:12 +0000
(12:04 +1000)
Conflicts:
arch/x86/include/asm/processor.h
arch/x86/kernel/cpu/common.c
arch/x86/kernel/process.c
Trivial merge