diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-19 00:26:11 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-19 00:26:11 +0100 |
| commit | 7bcd5b4671c3aa9185a7e6f76ee12e392070ddea (patch) | |
| tree | db80f1cc57cdec18e46bf8e37691b02f9a2ce35e /arch/arm/mach-sa1100/collie.c | |
| parent | Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff) | |
| parent | PCI: Fix pci cardbus removal (diff) | |
| download | linux-7bcd5b4671c3aa9185a7e6f76ee12e392070ddea.tar.xz linux-7bcd5b4671c3aa9185a7e6f76ee12e392070ddea.zip | |
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
Diffstat (limited to 'arch/arm/mach-sa1100/collie.c')
0 files changed, 0 insertions, 0 deletions