H. Peter Anvin 68d00bbebb Merge remote-tracking branch 'origin/x86/mm' into x86/mm2 ...

Explicitly merging these two branches due to nontrivial conflicts and
to allow further work.

Resolved Conflicts:
	arch/x86/kernel/head32.c
	arch/x86/kernel/head64.c
	arch/x86/mm/init_64.c
	arch/x86/realmode/init.c

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

2013-02-01 02:28:36 -08:00

..

rm

x86, suspend: Correct the restore of CR4, EFER; skip computing EFLAGS.ID

2012-10-02 08:42:31 +02:00

init.c

Merge remote-tracking branch 'origin/x86/mm' into x86/mm2

2013-02-01 02:28:36 -08:00

Makefile

x86, realmode: Move kernel/realmode.c to realmode/init.c

2012-05-16 13:49:10 -07:00

rmpiggy.S

…