tree 0ac0c157b25c4da4551ad5527f752e900515f917
parent 98e8d2e094de67315f786cd81b1dccb4ac040cc2
parent 3f4aa45ceea5789a4aade536acc27f2e0d3da5e1
author Linus Torvalds <torvalds@linux-foundation.org> 1417210367 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1417210367 -0800

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

Pull ARM fixes from Russell King:
 "Another round of relatively small ARM fixes.

  Thomas spotted that the strex backoff delay bit was a disable bit, so
  it needed to be clear for this to work.  Vladimir spotted that using a
  restart block for the cache flush operation would return -EINTR, which
  userspace was not expecting.  Dmitry spotted that the auxiliary
  control register accesses for Xscale were not correct"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: 8226/1: cacheflush: get rid of restarting block
  ARM: 8222/1: mvebu: enable strex backoff delay
  ARM: 8216/1: xscale: correct auxiliary register in suspend/resume