Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Apr 2013 02:49:03 +0000 (19:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Apr 2013 02:49:03 +0000 (19:49 -0700)
commit542a67246794a0f346e95129c2a2221480462eba
tree001ddc86937e390fde7f6c288c7c212794798818
parent4be41343a2aba91e6e9709c446b824350e9a31ed
parentb6c7aabd923a17af993c5a5d5d7995f0b27c000a
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