You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Linus Torvalds
11bd04f6f3
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: (109 commits)
PCI: fix coding style issue in pci_save_state()
PCI: add pci_request_acs
PCI: fix BUG_ON triggered by logical PCIe root port removal
PCI: remove ifdefed pci_cleanup_aer_correct_error_status
PCI: unconditionally clear AER uncorr status register during cleanup
x86/PCI: claim SR-IOV BARs in pcibios_allocate_resource
PCI: portdrv: remove redundant definitions
PCI: portdrv: remove unnecessary struct pcie_port_data
PCI: portdrv: minor cleanup for pcie_port_device_register
PCI: portdrv: add missing irq cleanup
PCI: portdrv: enable device before irq initialization
PCI: portdrv: cleanup service irqs initialization
PCI: portdrv: check capabilities first
PCI: portdrv: move PME capability check
PCI: portdrv: remove redundant pcie type calculation
PCI: portdrv: cleanup pcie_device registration
PCI: portdrv: remove redundant pcie_port_device_probe
PCI: Always set prefetchable base/limit upper32 registers
PCI: read-modify-write the pcie device control register when initiating pcie flr
PCI: show dma_mask bits in /sys
...
Fixed up conflicts in:
arch/x86/kernel/amd_iommu_init.c
drivers/pci/dmar.c
drivers/pci/hotplug/acpiphp_glue.c
|
15 years ago |
.. |
gameport
|
…
|
|
joystick
|
…
|
|
keyboard
|
…
|
|
misc
|
…
|
|
mouse
|
…
|
|
serio
|
…
|
|
tablet
|
…
|
|
touchscreen
|
…
|
|
Kconfig
|
…
|
|
Makefile
|
…
|
|
apm-power.c
|
…
|
|
evbug.c
|
…
|
|
evdev.c
|
…
|
|
ff-core.c
|
…
|
|
ff-memless.c
|
…
|
|
fixp-arith.h
|
…
|
|
input-compat.c
|
…
|
|
input-compat.h
|
…
|
|
input-polldev.c
|
…
|
|
input.c
|
…
|
|
joydev.c
|
…
|
|
mousedev.c
|
…
|
|
sparse-keymap.c
|
…
|
|
xen-kbdfront.c
|
…
|
|