]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 18 Feb 2012 23:26:11 +0000 (15:26 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 18 Feb 2012 23:26:11 +0000 (15:26 -0800)
commit7bcd5b4671c3aa9185a7e6f76ee12e392070ddea
treedb80f1cc57cdec18e46bf8e37691b02f9a2ce35e
parent58e44bafbb601b5abc250cdbb032b1f4022ef30a
parent3682a3946d2b0bad621db871e3bead83e523a238
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