]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0a9cb46 ba8f5ba)
Merge branch 'merge'
authorPaul Mackerras <paulus@samba.org>
Thu, 1 Jun 2006 09:05:23 +0000 (19:05 +1000)
committerPaul Mackerras <paulus@samba.org>
Thu, 1 Jun 2006 09:05:23 +0000 (19:05 +1000)
1  2 
arch/powerpc/kernel/prom_init.c patch | diff1 | diff2 | blob | history

diff --cc arch/powerpc/kernel/prom_init.c
Simple merge
Linux 2.6 source tree