diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-19 13:55:47 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-19 13:55:47 -0700 |
commit | ddd13dc606ea1a06f2cf7d11dc06418de3e28121 (patch) | |
tree | 25298e8eb405d4d3a6f0305136393782d3a7c760 /mm/swap_state.c | |
parent | f607e3a03c90e8c050cb0c12ec9967c2925cc812 (diff) | |
parent | a59f2bbaedc5de5a69db5d9c914462173ef3ffa6 (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:
PCI: add acpi_find_root_bridge_handle
PCI: acpi_pcihp: run _OSC on a root bridge
x86/PCI: irq and pci_ids patch for Intel Ibex Peak PCHs
x86/PCI: allow scanning of 255 PCI busses
x86, pci: detect end_bus_number according to acpi/e820 reserved, v2
pci: debug extra pci bus resources
pci: debug extra pci resources range
Diffstat (limited to 'mm/swap_state.c')
0 files changed, 0 insertions, 0 deletions