Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 11 Mar 2008 01:05:47 +0000 (18:05 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 11 Mar 2008 01:05:47 +0000 (18:05 -0700)
commiteffe008d276f52674d5352deefb68ec409a5ef9b
treed90c07be8a4842a9419c0a6c685f4d68bfa31959
parentee215ca3b21dd73bec95dcaaa8c89e64cff6cbf8
parentb91aac29bb9b7cab34b0297449bd2a16944b83d9
Merge git://git./linux/kernel/git/gregkh/pci-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6:
  PCI Hotplug: Fix small mem leak in IBM Hot Plug Controller Driver
  PCI: rename DECLARE_PCI_DEVICE_TABLE to DEFINE_PCI_DEVICE_TABLE