tree db80f1cc57cdec18e46bf8e37691b02f9a2ce35e
parent 58e44bafbb601b5abc250cdbb032b1f4022ef30a
parent 3682a3946d2b0bad621db871e3bead83e523a238
author Linus Torvalds <torvalds@linux-foundation.org> 1329607571 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1329607571 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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