Merge tag 'v3.14.22' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux...

This is the 3.14.22 stable release

* tag 'v3.14.22' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable: (315 commits)
  Linux 3.14.22
  serial: 8250: Add Quark X1000 to 8250_pci.c
  crypto: caam - fix addressing of struct member
  usb: musb: dsps: kill OTG timer on suspend
  USB: cp210x: add support for Seluxit USB dongle
  USB: serial: cp210x: added Ketra N1 wireless interface support
  USB: Add device quirk for ASUS T100 Base Station keyboard
  tcp: fixing TLP's FIN recovery
  sctp: handle association restarts when the socket is closed.
  team: avoid race condition in scheduling delayed work
  ip6_gre: fix flowi6_proto value in xmit path
  hyperv: Fix a bug in netvsc_start_xmit()
  gro: fix aggregation for skb using frag_list
  Revert "net/macb: add pinctrl consumer support"
  macvtap: Fix race between device delete and open.
  xfrm: Generate queueing routes only from route lookup functions
  xfrm: Generate blackhole routes only from route lookup functions
  tg3: Allow for recieve of full-size 8021AD frames
  tg3: Work around HW/FW limitations with vlan encapsulated frames
  net: allow macvlans to move to net namespace
  ...

Conflicts:
	arch/arm/boot/dts/dra7-evm.dts
	arch/arm/mach-omap2/omap_hwmod.c
	arch/arm/mach-omap2/omap_hwmod_7xx_data.c
	arch/arm/mach-omap2/soc.h
	drivers/usb/dwc3/core.c
	drivers/usb/musb/musb_dsps.c

Signed-off-by: Dan Murphy <DMurphy@ti.com>

diff --cc arch/arm/boot/dts/dra7-evm.dts
index 08a803b,9381754..39ea3ef
--- 1/arch/arm/boot/dts/dra7-evm.dts
--- 2/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@@ -212,10 -48,24 +212,22 @@@
                >;
        };
  
 -      mcspi2_pins: pinmux_mcspi2_pins {
+       mcspi1_pins: pinmux_mcspi1_pins {
+               pinctrl-single,pins = <
+                       0x3a4 (PIN_INPUT | MUX_MODE0) /* spi1_sclk */
+                       0x3a8 (PIN_INPUT | MUX_MODE0) /* spi1_d1 */
+                       0x3ac (PIN_INPUT | MUX_MODE0) /* spi1_d0 */
+                       0x3b0 (PIN_INPUT_SLEW | MUX_MODE0) /* spi1_cs0 */
+                       0x3b4 (PIN_INPUT_SLEW | MUX_MODE0) /* spi1_cs1 */
+                       0x3b8 (PIN_INPUT_SLEW | MUX_MODE6) /* spi1_cs2.hdmi1_hpd */
+                       0x3bc (PIN_INPUT_SLEW | MUX_MODE6) /* spi1_cs3.hdmi1_cec */
+               >;
+       };
+ 
 +      uart1_pins: pinmux_uart1_pins {
                pinctrl-single,pins = <
 -                      0x3c0 (PIN_INPUT | MUX_MODE0) /* spi2_sclk */
 -                      0x3c4 (PIN_INPUT_SLEW | MUX_MODE0) /* spi2_d1 */
 -                      0x3c8 (PIN_INPUT_SLEW | MUX_MODE0) /* spi2_d1 */
 -                      0x3cc (PIN_INPUT_SLEW | MUX_MODE0) /* spi2_cs0 */
 +                      0x3e0 (PIN_INPUT_SLEW | MUX_MODE0) /* uart1_rxd */
 +                      0x3e4 (PIN_INPUT_SLEW | MUX_MODE0) /* uart1_txd */
                >;
        };
  

diff --cc arch/arm/mach-omap2/omap_hwmod.c
Simple merge

diff --cc arch/arm/mach-omap2/soc.h
Simple merge

diff --cc drivers/ata/ahci.c
Simple merge

diff --cc drivers/ata/pata_scc.c
Simple merge

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

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

diff --cc drivers/gpu/drm/i915/i915_gem.c
Simple merge

diff --cc drivers/gpu/drm/tilcdc/tilcdc_drv.c
Simple merge

diff --cc drivers/gpu/drm/tilcdc/tilcdc_slave.c
Simple merge

diff --cc drivers/media/v4l2-core/videobuf2-core.c
index 8e6695c,06faea4..1a59e26
--- 1/drivers/media/v4l2-core/videobuf2-core.c
--- 2/drivers/media/v4l2-core/videobuf2-core.c
+++ b/drivers/media/v4l2-core/videobuf2-core.c
@@@ -1486,19 -1449,8 +1488,20 @@@ static int vb2_internal_qbuf(struct vb2
         * dequeued in dqbuf.
         */
        list_add_tail(&vb->queued_entry, &q->queued_list);
+       q->waiting_for_buffers = false;
        vb->state = VB2_BUF_STATE_QUEUED;
 +      if (V4L2_TYPE_IS_OUTPUT(q->type)) {
 +              /*
 +               * For output buffers copy the timestamp if needed,
 +               * and the timecode field and flag if needed.
 +               */
 +              if ((q->timestamp_flags & V4L2_BUF_FLAG_TIMESTAMP_MASK) ==
 +                  V4L2_BUF_FLAG_TIMESTAMP_COPY)
 +                      vb->v4l2_buf.timestamp = b->timestamp;
 +              vb->v4l2_buf.flags |= b->flags & V4L2_BUF_FLAG_TIMECODE;
 +              if (b->flags & V4L2_BUF_FLAG_TIMECODE)
 +                      vb->v4l2_buf.timecode = b->timecode;
 +      }
  
        /*
         * If already streaming, give the buffer to driver for processing.

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

diff --cc drivers/usb/musb/musb_dsps.c
index 310f4fd,85f5215..90d74e1
--- 1/drivers/usb/musb/musb_dsps.c
--- 2/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@@ -861,13 -705,8 +861,14 @@@ static int dsps_suspend(struct device *
        struct dsps_glue *glue = dev_get_drvdata(dev);
        const struct dsps_musb_wrapper *wrp = glue->wrp;
        struct musb *musb = platform_get_drvdata(glue->musb);
 -      void __iomem *mbase = musb->ctrl_base;
 +      void __iomem *mbase;
 +
 +      if (!musb)
 +              /* This can happen if musb is still defered */
 +              return 0;
 +
 +      mbase = musb->ctrl_base;
+ 
        del_timer_sync(&glue->timer);
        glue->context.control = dsps_readl(mbase, wrp->control);
        glue->context.epintr = dsps_readl(mbase, wrp->epintr_set);

diff --cc include/media/videobuf2-core.h
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge

diff --cc sound/soc/davinci/davinci-mcasp.c
Simple merge