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

PCI changes for the v3.16 merge window (part 2):

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

PCI: Removed unused parts of Page Request Interface support

2014-01-10 14:00:47 -07:00

bus.c

PCI: Move EXPORT_SYMBOL so it immediately follows function/variable

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

host-bridge.c

PCI: Remove unnecessary includes of <linux/init.h>

2014-04-14 16:12:37 -06:00

hotplug-pci.c

PCI: Remove unnecessary __ref annotations

2014-04-29 17:36:44 -06:00

htirq.c

PCI changes for the v3.16 merge window (part 2):

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

ioapic.c

ACPI and power management updates for 3.14-rc1

2014-01-24 15:51:02 -08:00

iov.c

PCI: Make pci_bus_add_device() void

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

irq.c

PCI: Fix whitespace, capitalization, and spelling errors

2013-11-14 11:28:18 -07:00

Kconfig

PCI: Convert ioapic to be builtin only, not modular

2014-01-03 14:31:38 -07:00

Makefile

Merge branch 'x86-nuke-platforms-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2014-04-02 13:15:58 -07:00

msi.c

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

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

of.c

PCI: OF: Don't crash when bridge parent is NULL.

2011-08-19 08:51:37 -07:00

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

Revert "PCI: Remove from bus_list and release resources in pci_release_dev()"

2014-02-01 10:24:31 -08:00

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

VERIFY_OCTAL_PERMISSIONS: stricter checking for sysfs perms.

2014-03-24 12:21:00 +10:30

syscall.c

PCI: Whitespace cleanup

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

vc.c

PCI: Rename PCI_VC_PORT_REG1/2 to PCI_VC_PORT_CAP1/2

2013-12-17 17:49:39 -07:00

vpd.c

pci: Fix files needing export.h for EXPORT_SYMBOL/THIS_MODULE

2011-10-31 19:31:22 -04:00

xen-pcifront.c

arch: Mass conversion of smp_mb__*()

2014-04-18 14:20:48 +02:00