]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Sep 2014 00:02:57 +0000 (17:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Sep 2014 00:02:57 +0000 (17:02 -0700)
commit94559a4a81a6912f6ca22988e544a43401947c68
treeb3c798ddb053df5c687fec7500b4d9fb42137235
parent19ed3eb975b7de9b4b0e41714eb9302cd95e7ae6
parenteba1c71819d210f5e0d522571f9b8abce94fe9c5
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

Pull ARM fixes from Russell King:
 "Various assorted fixes:

   - a couple of patches from Mark Rutland to resolve an errata with
     Cortex-A15 CPUs.
   - fix cpuidle for the CPU part ID changes in the last merge window
   - add support for a relocation which ARM binutils is generating in
     some circumstances"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: 8130/1: cpuidle/cpuidle-big_little: fix reading cpu id part number
  ARM: 8129/1: errata: work around Cortex-A15 erratum 830321 using dummy strex
  ARM: 8128/1: abort: don't clear the exclusive monitors
  ARM: 8127/1: module: add support for R_ARM_TARGET1 relocations