From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 24 Apr 2010 18:32:12 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=383bee6b54a1eeac3a286812be8a5c3f122fd834;p=openwrt%2Fstaging%2Fblogic.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: Ensure we re-enable devices on resume
  x86/PCI: parse additional host bridge window resource types
  PCI: revert broken device warning
  PCI aerdrv: use correct bit defines and add 2ms delay to aer_root_reset
  x86/PCI: ignore Consumer/Producer bit in ACPI window descriptions
---

383bee6b54a1eeac3a286812be8a5c3f122fd834