]> git.hungrycats.org Git - linux/commit
Merge gregkh@kernel.bkbits.net:linux/pci-2.6
authorGreg Kroah-Hartman <greg@kroah.com>
Wed, 6 Oct 2004 07:25:08 +0000 (00:25 -0700)
committerGreg Kroah-Hartman <greg@kroah.com>
Wed, 6 Oct 2004 07:25:08 +0000 (00:25 -0700)
commit0e1a581b2f998e282d9aefce36f3cb98456fe1fd
tree5b987d4a3237acfcad5c80c6145f121a076fd6a6
parent66c9a93be49c22494559460fb25b35dae2a2bb9e
parentb573ca55a775eb80386500f8bbef08bd1dc80bc6
Merge gregkh@kernel.bkbits.net:linux/pci-2.6
into kroah.com:/home/greg/linux/BK/pci-2.6
drivers/char/agp/intel-agp.c
drivers/char/agp/intel-mch-agp.c