Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 Sep 2008 19:15:50 +0000 (12:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 Sep 2008 19:15:50 +0000 (12:15 -0700)
commite002bcc2f8e766a96472379e3b4a8a4e8938a93e
tree05135f2664b399bb28323fa7a9c721be698da792
parent75f500204c645787c27d6085d39291946c928e02
parentb08508c40adf3fd1330aabc4f37d3254179776c4
Merge branch 'for-linus' of git://git./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