git » linux-kernel » commit e002bcc

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

author Linus Torvalds
2008-09-23 19:15:50 UTC
committer Linus Torvalds
2008-09-23 19:15:50 UTC
parent 75f500204c645787c27d6085d39291946c928e02
parent b08508c40adf3fd1330aabc4f37d3254179776c4
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: fix compiler warnings in pci_get_subsys()
  PCI: Fix pcie_aspm=force