From: Bjorn Helgaas Date: Fri, 20 Dec 2013 19:41:18 +0000 (-0700) Subject: Merge branch 'pci/deletion' into next X-Git-Tag: v3.14-rc1~132^2~14 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=f72e11123ba122c4ed8fcee52ab57cf3fbe81178;p=linux.git Merge branch 'pci/deletion' into next * pci/deletion: PCI/portdrv: Remove extra get_device()/put_device() for pcie_device PCI/portdrv: Add put_device() after device_register() failure PCI/portdrv: Cleanup error paths --- f72e11123ba122c4ed8fcee52ab57cf3fbe81178