Merge branch 'p-ti-linux-3.14.y-common' into p-ti-linux-3.14.y-android

* p-ti-linux-3.14.y-common: (131 commits)
  ARM: DRA752: OPP: reuse OPP information for ES2.0
  ARM: DRA752: Add ID detect for ES2.0
  media: ti-vpe: vip: fix try_format for interlaced frames usecase
  Linux 3.14.49
  MIPS: KVM: Do not sign extend on unsigned MMIO load
  qla2xxx: Mark port lost when we receive an RSCN for it.
  Fix firmware loader uevent buffer NULL pointer dereference
  hpfs: hpfs_error: Remove static buffer, use vsprintf extension %pV instead
  arm64: Don't report clear pmds and puds as huge
  agp/intel: Fix typo in needs_ilk_vtd_wa()
  rbd: use GFP_NOIO in rbd_obj_request_create()
  9p: don't leave a half-initialized inode sitting around
  9p: forgetting to cancel request on interrupted zero-copy RPC
  SUNRPC: Fix a memory leak in the backchannel code
  nfs: increase size of EXCHANGE_ID name string buffer
  fixing infinite OPEN loop in 4.0 stateid recovery
  NFS: Fix size of NFSACL SETACL operations
  watchdog: omap: assert the counter being stopped before reprogramming
  of: return NUMA_NO_NODE from fallback of_node_to_nid()
  block: Do a full clone when splitting discard bios
  ...

Change-Id: Ic8784c782822bbce50c409d55603b3ec8269e1fa
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>

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

diff --cc drivers/cpuidle/governors/menu.c
Simple merge

diff --cc drivers/media/platform/ti-vpe/vip.c
Simple merge

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

diff --cc fs/ext4/mballoc.c
Simple merge

diff --cc fs/ext4/super.c
Simple merge

diff --cc include/linux/of.h
Simple merge

diff --cc kernel/power/Kconfig
Simple merge

diff --cc kernel/printk/printk.c
Simple merge

diff --cc kernel/trace/trace.h
Simple merge