tree c11f08a401783848deb7f41f65e990333971ba66
parent 5fe8252fc3a21666cf19053fbd7ec7bd9664f5d9
parent 81bb0e198b4638ac65233b316f4588639dfe1fcd
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1171918795 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1171918795 -0800

Merge master.kernel.org:/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