git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
abfe0af
d9244b5
)
Merge branch 'linus' into irq/numa
author
Ingo Molnar
<mingo@elte.hu>
Mon, 1 Jun 2009 19:06:21 +0000
(21:06 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Mon, 1 Jun 2009 19:06:21 +0000
(21:06 +0200)
Conflicts:
arch/mips/sibyte/bcm1480/irq.c
arch/mips/sibyte/sb1250/irq.c
Merge reason: we gathered a few conflicts plus update to latest upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff