From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 18 Feb 2012 23:26:11 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
X-Git-Tag: firefly_0821_release~3680^2~3519
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7bcd5b4671c3aa9185a7e6f76ee12e392070ddea;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://git./linux/kernel/git/jbarnes/pci

One regression fix for SR-IOV on PPC and a couple of misc fixes from
Yinghai.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci:
  PCI: Fix pci cardbus removal
  PCI: set pci sriov page size before reading SRIOV BAR
  PCI: workaround hard-wired bus number V2
---

7bcd5b4671c3aa9185a7e6f76ee12e392070ddea