diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 18:57:08 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 18:57:08 +0200 |
| commit | b7f21bb2e23b4fec16b448a34889f467465be659 (patch) | |
| tree | 3569f95b5ebf5bcce03aad976ef69b9b818de832 /net/ax25 | |
| parent | Merge branch 'cputime' of git://git390.marist.edu/pub/scm/linux-2.6 (diff) | |
| parent | x86/PCI: make 32 bit NUMA node array int, not unsigned char (diff) | |
| download | linux-b7f21bb2e23b4fec16b448a34889f467465be659.tar.xz linux-b7f21bb2e23b4fec16b448a34889f467465be659.zip | |
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (21 commits)
x86/PCI: make 32 bit NUMA node array int, not unsigned char
x86/PCI: default pcibus cpumask to all cpus if it lacks affinity
MAINTAINTERS: remove hotplug driver entries
PCI: pciehp: remove slot capabilities definitions
PCI: pciehp: remove error message definitions
PCI: pciehp: remove number field
PCI: pciehp: remove hpc_ops
PCI: pciehp: remove pci_dev field
PCI: pciehp: remove crit_sect mutex
PCI: pciehp: remove slot_bus field
PCI: pciehp: remove first_slot field
PCI: pciehp: remove slot_device_offset field
PCI: pciehp: remove hp_slot field
PCI: pciehp: remove device field
PCI: pciehp: remove bus field
PCI: pciehp: remove slot_num_inc field
PCI: pciehp: remove num_slots field
PCI: pciehp: remove slot_list field
PCI: fix VGA arbiter header file
PCI: Disable AER with pci=nomsi
...
Fixed up trivial conflicts in MAINTAINERS
Diffstat (limited to 'net/ax25')
0 files changed, 0 insertions, 0 deletions