git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 17bdc6c ca56a95)
Merge remote branch 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 30 Jun 2011 05:23:59 +0000 (15:23 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 30 Jun 2011 05:23:59 +0000 (15:23 +1000)
1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
arch/powerpc/kernel/prom.c patch | diff1 | diff2 | blob | history
arch/powerpc/mm/mem.c patch | diff1 | diff2 | blob | history
arch/powerpc/sysdev/mpic.c patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc arch/powerpc/kernel/prom.c
Simple merge
diff --cc arch/powerpc/mm/mem.c
Simple merge
diff --cc arch/powerpc/sysdev/mpic.c
Simple merge
Pandora Kernel Repository