diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-05 12:39:10 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-05 12:39:10 -0700 |
commit | 108c1961847df2a875047c0fd27b419cb817d213 (patch) | |
tree | 5138948168df7043b1d39a1dbeb4a472f1cd66da /drivers/infiniband/ulp/ipoib/ipoib.h | |
parent | 48fc8de9cd093b8c9e2cfa339421862bae3a6cad (diff) | |
parent | 0df18ff366853cdf31e5238764ec5c63e6b5a398 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
x86 PCI: call dmi_check_pciprobe()
x86/pci: add pci=skip_isa_align command lines.
x86/pci: remove flag in pci_cfg_space_size_ext
x86: fix section mismatch in pci_scan_bus
Diffstat (limited to 'drivers/infiniband/ulp/ipoib/ipoib.h')
0 files changed, 0 insertions, 0 deletions