diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-05 21:39:10 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-05 21:39:10 +0200 |
| commit | 108c1961847df2a875047c0fd27b419cb817d213 (patch) | |
| tree | 5138948168df7043b1d39a1dbeb4a472f1cd66da /crypto/deflate.c | |
| parent | CONFIG_SCSI_MAC_ESP needs CONFIG_SCSI_SPI_ATTRS (diff) | |
| parent | x86 PCI: call dmi_check_pciprobe() (diff) | |
| download | linux-108c1961847df2a875047c0fd27b419cb817d213.tar.xz linux-108c1961847df2a875047c0fd27b419cb817d213.zip | |
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 'crypto/deflate.c')
0 files changed, 0 insertions, 0 deletions