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

This is the 3.14.5 stable release

* tag 'v3.14.5' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable: (141 commits)
  Linux 3.14.5
  net-gro: reset skb->truesize in napi_reuse_skb()
  ipv4: initialise the itag variable in __mkroute_input
  ipv6: gro: fix CHECKSUM_COMPLETE support
  net_sched: fix an oops in tcindex filter
  ip_tunnel: Initialize the fallback device properly
  batman-adv: fix local TT check for outgoing arp requests in DAT
  batman-adv: increase orig refcount when storing ref in gw_node
  batman-adv: fix reference counting imbalance while sending fragment
  batman-adv: fix indirect hard_iface NULL dereference
  net: gro: make sure skb->cb[] initial content has not to be zero
  bonding: fix out of range parameters for bond_intmax_tbl
  net: phy: Don't call phy_resume if phy_init_hw failed
  rtnetlink: wait for unregistering devices in rtnl_link_unregister()
  ipv6: fix calculation of option len in ip6_append_data
  net: avoid dependency of net_get_random_once on nop patching
  net: filter: s390: fix JIT address randomization
  net: filter: x86: fix JIT address randomization
  batman-adv: fix removing neigh_ifinfo
  batman-adv: always run purge_orig_neighbors
  ...

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

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

diff --cc drivers/gpu/drm/radeon/radeon_display.c
Simple merge