| commit | d9ec5ad24ce80b7ef69a0717363db661d13aada5 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Sun May 28 16:35:52 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Sun May 28 16:35:52 2006 -0700 |
| tree | 0a808684e7d5e61427ccd0ecb7f3849164a32aef | |
| parent | b82e8005af14b51600714971e0c6420c4e334a50 [diff] | |
| parent | 0737ac895afbfbe210557fa5fbafcca932d5fa7c [diff] |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [PATCH] the latest consensus libata resume fix