From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 17 Apr 2013 16:31:34 +0000 (-0600)
Subject: Merge branch 'pci/cleanup' into next
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~143^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=723ec4d06cb2eed481436cfe008f5f63c45e88fd;p=pandora-kernel.git

Merge branch 'pci/cleanup' into next

* pci/cleanup:
  PCI: Remove "extern" from function declarations
  PCI: Warn about failures instead of "must_check" functions
  PCI: Remove __must_check from definitions
  PCI: Remove unused variables
  PCI: Move cpci_hotplug_init() proto to header file
  PCI: Make local functions/structs static
  PCI: Fix missing prototype for pcie_port_acpi_setup()

Conflicts:
	drivers/pci/hotplug/acpiphp.h
	include/linux/pci.h
---

723ec4d06cb2eed481436cfe008f5f63c45e88fd
Reading git-diff-tree failed