Merge tag 'v4.4.154' into artik-nexell-4.4

This is the 4.4.154 stable release

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/Kconfig.platforms
Simple merge

diff --cc arch/arm64/mm/init.c
Simple merge

diff --cc drivers/Makefile
Simple merge

diff --cc drivers/cpufreq/cpufreq.c
Simple merge

diff --cc drivers/devfreq/devfreq.c
Simple merge

diff --cc drivers/input/touchscreen/atmel_mxt_ts.c
Simple merge

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

diff --cc drivers/mmc/host/dw_mmc.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 1870aac,7bba30f..de0d7a4
--- 1/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
--- 2/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@@ -53,37 -53,8 +53,37 @@@
  #include "stmmac.h"
  #include <linux/reset.h>
  #include <linux/of_mdio.h>
 +#ifdef CONFIG_ARM_S5Pxx18_DEVFREQ
 +#include <linux/pm_qos.h>
 +#include <linux/soc/nexell/cpufreq.h>
 +#include <linux/workqueue.h>
 +#endif
 +
 +#ifdef CONFIG_ARM_S5Pxx18_DEVFREQ
 +#define QOS_REQUEST_TIMEOUT_US        100000 /* 100 milliseconds */
 +static struct pm_qos_request nx_net_qos;
 +
 +static void nx_net_qos_update(int val, int timeout)
 +{
 +      if (!pm_qos_request_active(&nx_net_qos))
 +              pm_qos_add_request(&nx_net_qos, PM_QOS_BUS_THROUGHPUT, val);
 +      else
 +              pm_qos_update_request_timeout(&nx_net_qos, val,
 +                                            timeout);
 +}
 +
 +static void qos_request_work(struct work_struct *work)
 +{
 +      struct stmmac_priv *priv = container_of(work, struct stmmac_priv,
 +                                              qos_work);
 +      int timeout = priv->plat->boost_busfreq_timeout ? :
 +              QOS_REQUEST_TIMEOUT_US;
 +
 +      nx_net_qos_update(NX_BUS_CLK_HIGH_KHZ, timeout);
 +}
 +#endif
  
- #define STMMAC_ALIGN(x)       L1_CACHE_ALIGN(x)
+ #define       STMMAC_ALIGN(x)         __ALIGN_KERNEL(x, SMP_CACHE_BYTES)
  
  /* Module parameters */
  #define TX_TIMEO      5000

diff --cc drivers/power/Kconfig
Simple merge

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

diff --cc drivers/thermal/Kconfig
Simple merge

diff --cc drivers/thermal/samsung/exynos_tmu.c
Simple merge

diff --cc drivers/tty/serial/samsung.c
index 1318118,4d532a0..267e429
mode 100755,100644..100755
--- 1/drivers/tty/serial/samsung.c
--- 2/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c

diff --cc drivers/usb/core/hub.c
Simple merge

diff --cc drivers/usb/dwc2/core.h
Simple merge

diff --cc drivers/usb/dwc2/gadget.c
Simple merge

diff --cc drivers/usb/dwc2/hcd.c
Simple merge

diff --cc drivers/usb/dwc2/hcd_intr.c
Simple merge

diff --cc drivers/usb/host/Kconfig
Simple merge

diff --cc drivers/usb/host/ohci-hcd.c
Simple merge

diff --cc drivers/video/fbdev/Kconfig
Simple merge

diff --cc mm/memory.c
Simple merge

diff --cc net/bluetooth/hci_event.c
Simple merge

diff --cc scripts/Makefile.lib
Simple merge

diff --cc sound/soc/generic/simple-card.c
Simple merge