From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 23 Sep 2008 19:15:50 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes... 
X-Git-Tag: v3.12-rc1~18338
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e002bcc2f8e766a96472379e3b4a8a4e8938a93e;p=kernel%2Fkernel-generic.git

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
---

e002bcc2f8e766a96472379e3b4a8a4e8938a93e