diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-13 10:48:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-13 10:48:35 -0700 |
| commit | 25c55d97209090db1a5f601815433f085bd1af78 (patch) | |
| tree | b39c158f9df27826d18f8c8dc2e03fb1eed42d40 /net/sysctl_net.c | |
| parent | 5dc93cf4576125f07cfc1b29cab0c9344c5b3d2b (diff) | |
| parent | c4e5fadd2a6fc0da465dcde761877d9a87313b33 (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:
ACPI/PCI: another multiple _OSC memory leak fix
x86/PCI: X86_PAT & mprotect
PCI: enable nv_msi_ht_cap_quirk for ALi bridges
PCI: Make the intel-iommu_wait_op macro work when jiffies are not running
ACPI/PCI: handle multiple _OSC
ACPI/PCI: handle multiple _OSC
x86/PCI: fix broken ISA DMA
PCI ACPI: fix uninitialized variable in __pci_osc_support_set
Diffstat (limited to 'net/sysctl_net.c')
0 files changed, 0 insertions, 0 deletions