diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-14 12:00:42 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-14 12:00:42 -0700 |
commit | 37e79a43acf963676fc358e7c9154c0d42c4f569 (patch) | |
tree | 6405c3143fe24a1d5cf028fae3e23e7d38848321 /drivers/acpi/event.c | |
parent | f1823acfbcc7d29029d6db757644bc820664af37 (diff) | |
parent | e9c1670c2a14ef9cc20d86b24b829f3947aad34e (diff) |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
ata_piix: add workaround for Samsung DB-P70
libata: Keep shadow last_ctl up to date during resets
sata_mv: fix MSI irq race condition
Diffstat (limited to 'drivers/acpi/event.c')
0 files changed, 0 insertions, 0 deletions