[GIT PULL] PCI fixes for v3.18

[Bjorn Helgaas <bhelgaas@google.com>]

Hi Linus,

These changes, intended for v3.18, fix:

  - An unintentional sysfs filename change.  5136b2da770d, which appeared
    in v3.13, changed "enable" to "enabled", and this changes it back.  Old
    users of "enable" are currently broken and will be helped by this
    change.  Anything that started to use "enabled" after v3.13 will be
    broken by this change.  If necessary, we can add a symlink to make both
    work, but this patch doesn't do that.

    See http://lkml.kernel.org/r/20141030163028.GA22250@kroah.com ("[PATCH]
    PCI: fix name of 'enable' sysfs file").

  - An i.MX6 clock problem that prevents mx6 nitrogen boards from booting.

  - A mistaken duplicate merge that added a check twice.  Nothing's broken;
    this just removes the unnecessary code.

Bjorn


The following changes since commit f114040e3ea6e07372334ade75d1ee0775c355e1:

  Linux 3.18-rc1 (2014-10-19 18:08:38 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git tags/pci-v3.18-fixes-1

for you to fetch changes up to d8e7d53a2fc14e0830ab728cb84ee19933d3ac8d:

  PCI: Rename sysfs 'enabled' file back to 'enable' (2014-10-30 11:17:10 -0600)

----------------------------------------------------------------
PCI updates for v3.18:

  Sysfs
    - Fix "enable" filename change (Greg Kroah-Hartman)

  PCI device hotplug
    - Revert duplicate merge (Kamal Mostafa)

  Freescale i.MX6
    - Wait for clocks to stabilize after ref_en (Richard Zhu)

----------------------------------------------------------------
Greg Kroah-Hartman (1):
      PCI: Rename sysfs 'enabled' file back to 'enable'

Kamal Mostafa (1):
      Revert duplicate "PCI: pciehp: Prevent NULL dereference during probe"

Richard Zhu (1):
      PCI: imx6: Wait for clocks to stabilize after ref_en

 drivers/pci/host/pci-imx6.c       | 13 ++++++++++---
 drivers/pci/hotplug/pciehp_core.c |  7 -------
 drivers/pci/pci-sysfs.c           |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)