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