Manual fixup for merge with Jens' "Suspend support for libata", commit ID 9b84754866. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
9b84754866