diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-11 10:13:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-11 10:13:24 -0700 |
| commit | 01a6a7790e8e466584fc845f3cfc1770ffa1fee5 (patch) | |
| tree | 92183acab5a93d86836faf9554f04119f44e0dcb /include/linux/mman.h | |
| parent | ae292dbd2e9385d4c63f0c7099ab73b60d1b26d3 (diff) | |
| parent | 99fa9844f0eed5582b5648f745204758b27db659 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
PCI: irq and pci_ids patch for Intel Tolapai
PCI: unhide SMBus on Compaq Deskpro EP 401963-001 motherboard
PCI: Remove __devinit from pcibios_get_irq_routing_table
PCI: remove devinit from pci_read_bridge_bases
PCI AER: fix warnings when PCIEAER=n
Diffstat (limited to 'include/linux/mman.h')
0 files changed, 0 insertions, 0 deletions