Merge branch 'suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 into linux-next

This commit is contained in:
Jesse Barnes 2008-06-12 12:06:58 -07:00 • committed by Jesse Barnes
commit 53eb2fbeb9
34 changed files with 80 additions and 101 deletions

View file

@ -153,7 +153,7 @@ enum { ide_unknown, ide_generic, ide_pci,
ide_qd65xx, ide_umc8672, ide_ht6560b,
ide_rz1000, ide_trm290,
ide_cmd646, ide_cy82c693, ide_4drives,
ide_pmac, ide_etrax100, ide_acorn,
ide_pmac, ide_acorn,
ide_au1xxx, ide_palm3710
};