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

* p-ti-linux-3.14.y-common-next: (187 commits)
  ARM: dts: dra7xx-jamr3: Enable i2c4 required for radio
  Linux 3.14.46
  KVM: vgic: return int instead of bool when checking I/O ranges
  KVM: ARM/arm64: avoid returning negative error code as bool
  KVM: ARM/arm64: fix broken __percpu annotation
  KVM: ARM/arm64: fix non-const declaration of function returning const
  ARM64: KVM: store kvm_vcpu_fault_info est_el2 as word
  ARM: virt: fix wrong HSCTLR.EE bit setting
  arm64: KVM: export demux regids as KVM_REG_ARM64
  ARM: KVM: user_mem_abort: support stage 2 MMIO page mapping
  ARM: KVM: Unmap IPA on memslot delete/move
  arm/arm64: KVM: Fix and refactor unmap_range
  lpfc: Add iotag memory barrier
  pipe: iovec: Fix memory corruption when retrying atomic copy as non-atomic
  ath3k: add support of 13d3:3474 AR3012 device
  ath3k: Add support of 0489:e076 AR3012 device
  drm/mgag200: Reject non-character-cell-aligned mode widths
  tracing: Have filter check for balanced ops
  crypto: caam - fix RNG buffer cache alignment
  Linux 3.14.45
  ...

Conflicts:
	drivers/iommu/omap-iommu.c
	drivers/media/platform/ti-vpe/vip.c
	drivers/mmc/host/omap_hsmmc.c
	drivers/iommu/omap-iommu.h

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

diff --cc arch/arm/boot/dts/dra7.dtsi
Simple merge