diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-25 23:15:17 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-25 23:15:17 (GMT) |
| commit | 493f3358cb289ccf716c5a14fa5bb52ab75943e5 (patch) | |
| tree | 86b5385a63281824908d59107066b1267f75a386 /drivers/memstick | |
| parent | fe41947e1aa12e96a50edaee123b4e4de03b668b (diff) | |
| parent | 805bdaec1a44155db35f6ee5410d6bbc365324a8 (diff) | |
| download | linux-fsl-qoriq-493f3358cb289ccf716c5a14fa5bb52ab75943e5.tar.xz | |
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM: Make ACPI wakeup from S5 work again when CONFIG_PM_SLEEP is unset
Diffstat (limited to 'drivers/memstick')
0 files changed, 0 insertions, 0 deletions