diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-10 21:34:29 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-10 21:34:29 +0200 |
| commit | 28ffb5d3e0b563be5a9639c3a2b42f1a9430454f (patch) | |
| tree | 1a62828e6ebab52541d57b849866c332393d854a /drivers/acpi/sleep | |
| parent | Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 (diff) | |
| parent | fix BLK_DEV_HD_ONLY on ARM dependencies (diff) | |
| download | linux-28ffb5d3e0b563be5a9639c3a2b42f1a9430454f.tar.xz linux-28ffb5d3e0b563be5a9639c3a2b42f1a9430454f.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
fix BLK_DEV_HD_ONLY on ARM dependencies
ide: export ide_doubler
palm_bk3710: add warm-plug support
delkin_cb: add missing __init/__exit tags
delkin_cb: add warm-plug support
delkin_cb: use struct ide_port_info
delkin_cb: set proper hwif->gendev.parent value
ide: fix host drivers missing hwif->chipset initialization
ide-generic: add missing hwif->chipset setup
sis5513: add missing pci_enable_device() call
MAINTAINERS: remove SIS 5513 IDE entry
ide: remove the ide_etrax100 chipset type
Diffstat (limited to 'drivers/acpi/sleep')
0 files changed, 0 insertions, 0 deletions