git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e12f010
6a94cb7
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
author
Rusty Russell
<rusty@rustcorp.com.au>
Wed, 31 Dec 2008 12:35:57 +0000
(23:05 +1030)
committer
Rusty Russell
<rusty@rustcorp.com.au>
Wed, 31 Dec 2008 12:35:57 +0000
(23:05 +1030)
Conflicts:
arch/x86/kernel/io_apic.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff