From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 11 Mar 2008 01:05:47 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6
X-Git-Tag: v2.6.25-rc6~47
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=effe008d276f52674d5352deefb68ec409a5ef9b;p=~emulex%2Finfiniband.git

Merge git://git.kernel.org/pub/scm/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
---

effe008d276f52674d5352deefb68ec409a5ef9b