Greg Kroah-Hartman 9f48c89862 Merge 3.16-rc5 into char-misc-next ...

This resolves a number of merge issues with changes in this tree and
Linus's tree at the same time.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2014-07-13 15:26:47 -07:00

..

host

PCI: Merge multi-line quoted strings

2014-06-10 20:20:42 -06:00

hotplug

Merge tag 'pci-v3.16-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2014-06-12 13:20:24 -07:00

pcie

PCI: Merge multi-line quoted strings

2014-06-10 20:20:42 -06:00

access.c

PCI: Merge multi-line quoted strings

2014-06-10 20:20:42 -06:00

ats.c

…

bus.c

PCI: Move EXPORT_SYMBOL so it immediately follows function/variable

2014-06-10 13:36:10 -06:00

host-bridge.c

…

hotplug-pci.c

…

htirq.c

Merge tag 'pci-v3.16-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2014-06-12 13:20:24 -07:00

ioapic.c

…

iov.c

PCI: Make pci_bus_add_device() void

2014-05-30 09:34:27 -06:00

irq.c

…

Kconfig

…

Makefile

…

msi.c

Merge branches 'pci/msi', 'pci/iommu' and 'pci/cleanup' into next

2014-06-11 14:38:25 -06:00

of.c

…

pci-acpi.c

PCI: Use pci_is_bridge() to simplify code

2014-05-27 14:53:41 -06:00

pci-driver.c

PCI: Add pci_fixup_suspend_late quirk pass

2014-06-19 14:08:41 -07:00

pci-label.c

PCI: Whitespace cleanup

2014-06-10 20:20:19 -06:00

pci-stub.c

PCI: Whitespace cleanup

2014-06-10 20:20:19 -06:00

pci-sysfs.c

PCI: Merge multi-line quoted strings

2014-06-10 20:20:42 -06:00

pci.c

PCI: Fix unaligned access in AF transaction pending test

2014-06-17 15:40:13 -06:00

pci.h

Merge branches 'pci/hotplug', 'pci/pci_is_bridge' and 'pci/virtualization' into next

2014-05-28 16:21:07 -06:00

probe.c

PCI: Merge multi-line quoted strings

2014-06-10 20:20:42 -06:00

proc.c

PCI: Whitespace cleanup

2014-06-10 20:20:19 -06:00

quirks.c

PCI: Suspend/resume quirks for Apple thunderbolt

2014-06-19 14:12:26 -07:00

remove.c

…

rom.c

PCI: Whitespace cleanup

2014-06-10 20:20:19 -06:00

search.c

PCI: Whitespace cleanup

2014-06-10 20:20:19 -06:00

setup-bus.c

PCI: Merge multi-line quoted strings

2014-06-10 20:20:42 -06:00

setup-irq.c

PCI: Whitespace cleanup

2014-06-10 20:20:19 -06:00

setup-res.c

PCI: Merge multi-line quoted strings

2014-06-10 20:20:42 -06:00

slot.c

…

syscall.c

PCI: Whitespace cleanup

2014-06-10 20:20:19 -06:00

vc.c

…

vpd.c

…

xen-pcifront.c

…