On Mon, Jan 07, 2008 at 02:52:36PM +0100, Pavel Machek wrote: > kernel/suspend_64.c and power/cpu.c were equivalent. Move them into > power/cpu_*.c for consistency. > > power/swsusp.S and kernel/suspend_asm_64.S were both misnamed and > equivalent. Merge then minto power/hibernation_*.S. > > Signed-off-by: Pavel Machek <pavel@xxxxxxx> > > --- > commit 2a4fbaecebafff5b3114d0e87ecf73c45bc57f7b > tree a13462c0ae1fa640a9b9d08cfea0bf6056b26385 > parent eafb847ccc4f73c2737157b510dcf7b040f53147 > author Pavel <pavel@xxxxxxxxxx> Mon, 07 Jan 2008 14:50:25 +0100 > committer Pavel <pavel@xxxxxxxxxx> Mon, 07 Jan 2008 14:50:25 +0100 > > arch/x86/Makefile_64 | 1 > arch/x86/kernel/Makefile_64 | 2 > arch/x86/kernel/suspend_64.c | 294 -------------------------------------- > arch/x86/kernel/suspend_asm_64.S | 141 ------------------ > arch/x86/power/Makefile | 10 + > arch/x86/power/cpu.c | 133 ----------------- > arch/x86/power/cpu_32.c | 133 +++++++++++++++++ > arch/x86/power/cpu_64.c | 294 ++++++++++++++++++++++++++++++++++++++ > arch/x86/power/hibernation_32.S | 78 ++++++++++ > arch/x86/power/hibernation_64.S | 141 ++++++++++++++++++ > arch/x86/power/swsusp.S | 78 ---------- > 11 files changed, 655 insertions(+), 650 deletions(-) git diff -C -M -B (IIRC) gives a much more readable diffstat. They works for git format-patch and friends too. Sam _______________________________________________ linux-pm mailing list linux-pm@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linux-foundation.org/mailman/listinfo/linux-pm
