git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7be7585
8299608
)
Merge ../linux-2.6-x86
author
Rusty Russell
<rusty@rustcorp.com.au>
Sat, 13 Dec 2008 11:25:51 +0000
(21:55 +1030)
committer
Rusty Russell
<rusty@rustcorp.com.au>
Sat, 13 Dec 2008 11:25:51 +0000
(21:55 +1030)
Conflicts:
arch/x86/kernel/io_apic.c
kernel/sched.c
kernel/sched_stats.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff