Merge tag 'v4.1.21' of...

Merge tag 'v4.1.21' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into ti-linux-4.1.y

Linux 4.1.21

* tag 'v4.1.21' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable

: (47 commits)
  Linux 4.1.21
  perf/core: Fix perf_sched_count derailment
  perf: Cure event->pending_disable race
  perf: Do not double free
  arm64: replace read_lock to rcu lock in call_step_hook
  arm64: replace read_lock to rcu lock in call_break_hook
  ext4: fix races of writeback with punch hole and zero range
  ext4: fix races between buffered IO and collapse / insert range
  ext4: move unlocked dio protection from ext4_alloc_file_blocks()
  ext4: fix races between page faults and hole punching
  MIPS: Fix build error when SMP is used without GIC
  MIPS: Kconfig: Disable MIPS MT and SMP implementations for R6
  Revert "MIPS: Kconfig: Disable SMP/CPS for 64-bit"
  ld-version: Fix awk regex compile failure
  dmaengine: at_xdmac: fix residue computation
  KVM: MMU: fix ept=0/pte.u=1/pte.w=0/CR0.WP=0/CR4.SMEP=1/EFER.NX=0 combo
  s390/mm: four page table levels vs. fork
  tracing: Fix check for cpu online when event is disabled
  Revert "drm/radeon/pm: adjust display configuration after powerstate"
  drm/radeon/dp: add back special handling for NUTMEG
  ...

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

Conflicts:
	arch/arm/mach-omap2/omap_hwmod.h