tree aaba79c8ebafe06787b52c686505c76e15b81bdb
parent 000b9151d7851cc1e490b2a76d0206e524f43cca
parent 35405f256de924be56ea5edaca4cdc627f1bb0f8
author Linus Torvalds <torvalds@linux-foundation.org> 1218476316 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1218476316 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: Limit VPD length for Broadcom 5708S
  PCI PM: Export pci_pme_active to drivers
  PCI: remove duplicate symbol from pci_ids.h
  PCI: check the return value of device_create_bin_file() in pci_create_bus()
  PCI: fully restore MSI state at resume time
  DMA: make dma-coherent.c documentation kdoc-friendly
  PCI: make pci_register_driver() a macro
  PCI: add Broadcom 5708S to VPD length quirk