Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Oct 2016 14:58:01 +0000 (07:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Oct 2016 14:58:01 +0000 (07:58 -0700)
commitc7f5d36a3cc26e5068f4444aa22c4579e5eac85f
tree42f87d43c289127945d45ba4e1c082fdcba60f68
parenta6930aaee06755d1bdcfd943fbf614e4d92bb0c7
parentfb833b1fbb68461772dbf5e91bddea5e839187e9
Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm

Pull ARM fix from Russell King:
 "A 5% error in delay calculation was introduced during the last merge
  window, which had gone un-noticed until yesterday"

* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: fix delays