commit | 542a67246794a0f346e95129c2a2221480462eba | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 16 19:49:03 2013 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 16 19:49:03 2013 -0700 |
tree | 001ddc86937e390fde7f6c288c7c212794798818 | |
parent | 4be41343a2aba91e6e9709c446b824350e9a31ed [diff] | |
parent | b6c7aabd923a17af993c5a5d5d7995f0b27c000a [diff] |
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