From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 6 Jun 2009 21:33:54 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes... 
X-Git-Tag: firefly_0821_release~14033
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ccc0d38ec13d4649d4168c1db590137df53ad783;p=firefly-linux-kernel-4.4.55.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:
  x86/pci: fix mmconfig detection with 32bit near 4g
  PCI: use fixed-up device class when configuring device
---

ccc0d38ec13d4649d4168c1db590137df53ad783