2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-30 16:13:54 +08:00
linux-next/drivers/uio
Linus Torvalds 7b67e75147 Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci: (80 commits)
  x86/PCI: Expand the x86_msi_ops to have a restore MSIs.
  PCI: Increase resource array mask bit size in pcim_iomap_regions()
  PCI: DEVICE_COUNT_RESOURCE should be equal to PCI_NUM_RESOURCES
  PCI: pci_ids: add device ids for STA2X11 device (aka ConneXT)
  PNP: work around Dell 1536/1546 BIOS MMCONFIG bug that breaks USB
  x86/PCI: amd: factor out MMCONFIG discovery
  PCI: Enable ATS at the device state restore
  PCI: msi: fix imbalanced refcount of msi irq sysfs objects
  PCI: kconfig: English typo in pci/pcie/Kconfig
  PCI/PM/Runtime: make PCI traces quieter
  PCI: remove pci_create_bus()
  xtensa/PCI: convert to pci_scan_root_bus() for correct root bus resources
  x86/PCI: convert to pci_create_root_bus() and pci_scan_root_bus()
  x86/PCI: use pci_scan_bus() instead of pci_scan_bus_parented()
  x86/PCI: read Broadcom CNB20LE host bridge info before PCI scan
  sparc32, leon/PCI: convert to pci_scan_root_bus() for correct root bus resources
  sparc/PCI: convert to pci_create_root_bus()
  sh/PCI: convert to pci_scan_root_bus() for correct root bus resources
  powerpc/PCI: convert to pci_create_root_bus()
  powerpc/PCI: split PHB part out of pcibios_map_io_space()
  ...

Fix up conflicts in drivers/pci/msi.c and include/linux/pci_regs.h due
to the same patches being applied in other branches.
2012-01-11 18:50:26 -08:00
..
Kconfig UIO: add PRUSS UIO driver support 2011-03-07 13:10:27 -08:00
Makefile UIO: add PRUSS UIO driver support 2011-03-07 13:10:27 -08:00
uio_aec.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
uio_cif.c uio: Change mail address of Hans J. Koch 2010-11-10 16:57:11 -08:00
uio_netx.c uio_netx: Add support for netPLC cards 2011-04-19 16:56:02 -07:00
uio_pci_generic.c uio: Convert uio_generic_pci to new intx masking API 2012-01-06 12:10:35 -08:00
uio_pdrv_genirq.c uio: convert drivers/uio/* to use module_platform_driver() 2011-11-26 20:12:48 -08:00
uio_pdrv.c uio: convert drivers/uio/* to use module_platform_driver() 2011-11-26 20:12:48 -08:00
uio_pruss.c uio: convert drivers/uio/* to use module_platform_driver() 2011-11-26 20:12:48 -08:00
uio_sercos3.c uio: Remove IRQF_DISABLED from uio_sercos3.c 2010-08-05 13:53:33 -07:00
uio.c uio: Support physical addresses >32 bits on 32-bit systems 2011-10-18 11:18:57 -07:00