From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 18 Jul 2015 18:03:48 +0000 (-0700)
Subject: Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9d37e6679dfddbb5fa605fb2d7ff448f7cd6d038;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

Pull ARM fixes from Russell King:
 "A small set of ARM fixes for -rc3, most of them not far off
  one-liners, with the exception of fixing the V7 cache invalidation for
  incoming SMP processors which was causing problems for SoCFPGA
  devices"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: fix __virt_to_idmap build error on !MMU
  ARM: invalidate L1 before enabling coherency
  ARM: 8404/1: dma-mapping: fix off-by-one error in bitmap size check
  ARM: 8402/1: perf: Don't use of_node after putting it
  ARM: 8400/1: use virt_to_idmap to get phys_reset address
---

9d37e6679dfddbb5fa605fb2d7ff448f7cd6d038