]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'linux-2.6' into for-2.6.25
authorPaul Mackerras <paulus@samba.org>
Tue, 11 Dec 2007 04:30:27 +0000 (15:30 +1100)
committerPaul Mackerras <paulus@samba.org>
Tue, 11 Dec 2007 04:30:27 +0000 (15:30 +1100)
1  2 
arch/powerpc/platforms/powermac/pci.c

Simple merge