git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
15f7176
65fb0d2
)
Merge branch 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
author
Rusty Russell
<rusty@rustcorp.com.au>
Tue, 31 Mar 2009 03:03:50 +0000
(13:33 +1030)
committer
Rusty Russell
<rusty@rustcorp.com.au>
Tue, 31 Mar 2009 03:03:50 +0000
(13:33 +1030)
Conflicts:
arch/x86/include/asm/topology.h
drivers/oprofile/buffer_sync.c
(Both cases: changed in Linus' tree, removed in Ingo's).
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff