Merge tag 'v4.4.12' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux...

This is the 4.4.12 stable release

diff --cc drivers/mmc/card/block.c
Simple merge

diff --cc drivers/mmc/core/core.c
Simple merge

diff --cc drivers/mmc/host/sdhci-acpi.c
Simple merge

diff --cc drivers/mmc/host/sdhci-pci-core.c
index d5c693d,5ebe6eb..1180a6b
--- 1/drivers/mmc/host/sdhci-pci-core.c
--- 2/drivers/mmc/host/sdhci-pci-core.c
+++ b/drivers/mmc/host/sdhci-pci-core.c
@@@ -386,10 -376,7 +385,9 @@@ static int byt_emmc_probe_slot(struct s
  static int byt_sdio_probe_slot(struct sdhci_pci_slot *slot)
  {
        slot->host->mmc->caps |= MMC_CAP_POWER_OFF_CARD | MMC_CAP_NONREMOVABLE |
-                                MMC_CAP_BUS_WIDTH_TEST |
                                 MMC_CAP_WAIT_WHILE_BUSY;
 +      if (slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_BYT_SDIO)
 +              byt_set_dma_latency(slot->host);
        return 0;
  }
  

diff --cc drivers/spi/spi-pxa2xx.c
Simple merge

diff --cc drivers/tty/vt/vt.c
Simple merge

diff --cc net/ipv4/fib_frontend.c
Simple merge

diff --cc net/ipv4/route.c
Simple merge

diff --cc net/ipv4/tcp_output.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge

diff --cc sound/pci/hda/patch_realtek.c
Simple merge