aboutsummaryrefslogtreecommitdiff
path: root/drivers/acpi/sleep
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-06-10 12:34:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-10 12:34:29 -0700
commit28ffb5d3e0b563be5a9639c3a2b42f1a9430454f (patch)
tree1a62828e6ebab52541d57b849866c332393d854a /drivers/acpi/sleep
parent19f2b8dfea10e4d5cd34feb08cbab738504c25cf (diff)
parentefc0fc1c2f37c8c0e43c7616394a979a042b9331 (diff)
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