diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-03 00:04:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-03 00:04:36 -0400 |
| commit | c1fa238762ad2518ab6003983c16508470be6d81 (patch) | |
| tree | 027624143bc17ec70cc30bb745556657f382acb3 /include/acpi | |
| parent | b59449bea276793b8f228ea07bcb861670d79d75 (diff) | |
| parent | 531e3a61f55261bf466d0415c48999511334933c (diff) | |
Merge branch 'upstream-linus2' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus2' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[libata] sata_nv: undo merge error
Diffstat (limited to 'include/acpi')
0 files changed, 0 insertions, 0 deletions