From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 6 Oct 2016 14:58:01 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
X-Git-Tag: Ubuntu-5.0.0-8.9~6357
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c7f5d36a3cc26e5068f4444aa22c4579e5eac85f;p=mirror_ubuntu-disco-kernel.git

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
---

c7f5d36a3cc26e5068f4444aa22c4579e5eac85f