diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-26 00:15:17 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-26 00:15:17 +0100 |
| commit | 493f3358cb289ccf716c5a14fa5bb52ab75943e5 (patch) | |
| tree | 86b5385a63281824908d59107066b1267f75a386 /drivers/pcmcia/bcm63xx_pcmcia.c | |
| parent | rapidio: fix sysfs config attribute to access 16MB of maint space (diff) | |
| parent | PM: Make ACPI wakeup from S5 work again when CONFIG_PM_SLEEP is unset (diff) | |
| download | linux-493f3358cb289ccf716c5a14fa5bb52ab75943e5.tar.xz linux-493f3358cb289ccf716c5a14fa5bb52ab75943e5.zip | |
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/pcmcia/bcm63xx_pcmcia.c')
0 files changed, 0 insertions, 0 deletions