From: Andrew Morton <akpm@linux-foundation.org>

Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 kernel/sys.c |    2 +-
 sysctl.c     |    0 
 2 files changed, 1 insertion(+), 1 deletion(-)

diff -puN arch/sparc64/kernel/power.c~add-common-orderly_poweroff-fix arch/sparc64/kernel/power.c
diff -puN drivers/acpi/thermal.c~add-common-orderly_poweroff-fix drivers/acpi/thermal.c
diff -puN drivers/sbus/char/bbc_envctrl.c~add-common-orderly_poweroff-fix drivers/sbus/char/bbc_envctrl.c
diff -puN drivers/sbus/char/envctrl.c~add-common-orderly_poweroff-fix drivers/sbus/char/envctrl.c
diff -puN include/linux/reboot.h~add-common-orderly_poweroff-fix include/linux/reboot.h
diff -puN include/linux/sysctl.h~add-common-orderly_poweroff-fix include/linux/sysctl.h
diff -puN kernel/sys.c~add-common-orderly_poweroff-fix kernel/sys.c
--- a/kernel/sys.c~add-common-orderly_poweroff-fix
+++ a/kernel/sys.c
@@ -2286,7 +2286,7 @@ static void argv_cleanup(char **argv, ch
 }
 
 /**
- * Trigger an orderly system poweroff
+ * orderly_poweroff - Trigger an orderly system poweroff
  * @force: force poweroff if command execution fails
  *
  * This may be called from any context to trigger a system shutdown.
diff -puN kernel/sysctl.c~add-common-orderly_poweroff-fix kernel/sysctl.c
_