tree 415aefe6d168df27c006fcc53b1ea5242eabaaea
parent 7ed40918a386afc2e14a6d3da563ea6d13686c25
parent e650c305ec3178818b317dad37a6d9c7fa8ba28d
author Linus Torvalds <torvalds@g5.osdl.org> 1136566885 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1136566885 -0800

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>