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)
commitcfad589f565bdaa69d45fb1c0db124727a6eaf6e
tree0582935064aa9e6ba0c80efaf6c0ef35ff8c3867
parentbc625f20c08c5a5438a9fa3bb6d67fd84b1bab4b
parent437105f2a7f23899fd647e7ada683ba8dacf11ba
Merge branch 'linux-2.6' into for-2.6.25
arch/powerpc/platforms/powermac/pci.c