]> err.no Git - linux-2.6/commit
Merge branch 'merge'
authorPaul Mackerras <paulus@samba.org>
Sat, 29 Apr 2006 06:15:57 +0000 (16:15 +1000)
committerPaul Mackerras <paulus@samba.org>
Sat, 29 Apr 2006 06:15:57 +0000 (16:15 +1000)
commit29f147d746326e4db5fe350c70373081d61a2965
tree04c065ace8c62953441bc22079b93449b996f283
parent916a3d5729c8b710d56acf579f3fdb4de7c03e77
parent6fb8f3acbe833586eb32598d1f844eb9f77c4fba
Merge branch 'merge'
arch/powerpc/platforms/powermac/pci.c
include/asm-powerpc/io.h