tree 35b31fd683115cc7bc7dfcb2a7867469193cb17b
parent 6d66f5cd26e4c482e986130b7572f2735a0f7e8b
author Alan Stern <stern@rowland.harvard.edu> 1190403416 -0400
committer Greg Kroah-Hartman <gregkh@suse.de> 1192225872 -0700

PM: merge device power-management source files

This patch (as993) merges the suspend.c and resume.c files in
drivers/base/power into main.c, making some public symbols private.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>