From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 17 Apr 2013 02:49:03 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
X-Git-Tag: Ubuntu-5.10.0-12.13~19351
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=542a67246794a0f346e95129c2a2221480462eba;p=mirror_ubuntu-hirsute-kernel.git

Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

Pull ARM fix from Russell King:
 "A build fix for an incomplete change to the ARM cpu suspend code"

* branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
  ARM: Do 15e0d9e37c (ARM: pm: let platforms select cpu_suspend support) properly
---

542a67246794a0f346e95129c2a2221480462eba