]> git.hungrycats.org Git - linux/commitdiff
Merge PPC update
authorLinus Torvalds <torvalds@home.osdl.org>
Thu, 5 Feb 2004 12:36:49 +0000 (04:36 -0800)
committerLinus Torvalds <torvalds@home.osdl.org>
Thu, 5 Feb 2004 12:36:49 +0000 (04:36 -0800)
1  2 
drivers/ide/ppc/pmac.c
include/linux/pci_ids.h

Simple merge
Simple merge