| commit | d99cf9d679a520d67f81d805b7cb91c68e1847f0 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Fri Jan 06 09:01:25 2006 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Fri Jan 06 09:01:25 2006 -0800 |
| tree | 415aefe6d168df27c006fcc53b1ea5242eabaaea | |
| parent | 7ed40918a386afc2e14a6d3da563ea6d13686c25 [diff] | |
| parent | e650c305ec3178818b317dad37a6d9c7fa8ba28d [diff] |
Merge branch 'post-2.6.15' of git://brick.kernel.dk/data/git/linux-2.6-block Manual fixup for merge with Jens' "Suspend support for libata", commit ID 9b847548663ef1039dd49f0eb4463d001e596bc3. Signed-off-by: Linus Torvalds <torvalds@osdl.org>