]> git.hungrycats.org Git - linux/commit
Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 23 Aug 2004 07:22:41 +0000 (00:22 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 23 Aug 2004 07:22:41 +0000 (00:22 -0700)
commit359f482533ebf0c974eabbcc83df63b841998eb2
treeae93a243d19f93db7e71acfffe902cd5c50d9136
parent9c46b04a4e3ecec0e96a188c5e68c10c8dd769d3
parentf6297acf85a1c6bfd02ad772e719b8827c9bbd33
Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux

Manual merge of kernel/params.c clashes.
arch/i386/Kconfig
drivers/ide/pci/hpt366.c
include/linux/moduleparam.h
include/linux/pci_ids.h
kernel/params.c