From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 19 Feb 2007 20:59:55 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=733abe4fff3afa13e301bc8bc5bee9aac4b59fdc;p=openwrt%2Fstaging%2Fblogic.git

Merge /pub/scm/linux/kernel/git/gregkh/pci-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
  PCI: Make PCI device numa-node attribute visible in sysfs
  PCI: add systems for automatic breadth-first device sorting
  PCI: PCI devices get assigned redundant IRQs
  PCI: Make CARDBUS_MEM_SIZE and CARDBUS_IO_SIZE boot options
  PCI: pci.txt fix __devexit() usage
  PCI/sysfs/kobject kernel-doc fixes
---

733abe4fff3afa13e301bc8bc5bee9aac4b59fdc