| commit | 7bcd5b4671c3aa9185a7e6f76ee12e392070ddea | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Feb 18 15:26:11 2012 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Feb 18 15:26:11 2012 -0800 |
| tree | db80f1cc57cdec18e46bf8e37691b02f9a2ce35e | |
| parent | 58e44bafbb601b5abc250cdbb032b1f4022ef30a [diff] | |
| parent | 3682a3946d2b0bad621db871e3bead83e523a238 [diff] |
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