From: Bjorn Helgaas Date: Fri, 13 Dec 2013 17:19:43 +0000 (-0700) Subject: Merge branch 'for-linus' into next X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=fa4378041e6c285399fa1a104d8dd77daae4529f;p=deliverable%2Flinux.git Merge branch 'for-linus' into next * for-linus: MAINTAINERS: Add DesignWare, i.MX6, Armada, R-Car PCI host maintainers PCI: Disable Bus Master only on kexec reboot PCI: mvebu: Return 'unsupported' for Interrupt Line and Interrupt Pin PCI: Omit PCI ID macro strings to shorten quirk names PCI: Move device_del() from pci_stop_dev() to pci_destroy_dev() Revert "workqueue: allow work_on_cpu() to be called recursively" PCI: Avoid unnecessary CPU switch when calling driver .probe() method --- fa4378041e6c285399fa1a104d8dd77daae4529f