]> git.hungrycats.org Git - linux/commitdiff
Merge http://lia64.bkbits.net/linux-ia64-release-2.6.10
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 19 Oct 2004 11:27:56 +0000 (04:27 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 19 Oct 2004 11:27:56 +0000 (04:27 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux

1  2 
arch/ia64/pci/pci.c
drivers/ide/pci/sgiioc4.c
drivers/scsi/qla1280.c

Simple merge
Simple merge
Simple merge