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
..
2013-01-25 16:31:21 -08:00
2012-06-06 11:58:38 +02:00
2013-01-18 12:02:52 -08:00
2011-07-01 10:37:14 +02:00
2012-08-22 09:34:24 +02:00
2012-05-08 14:08:44 +02:00
2012-09-20 14:48:16 +02:00
2012-03-28 18:11:12 +01:00
2012-11-13 15:48:27 -05:00
2012-05-14 11:49:38 +02:00
2012-03-28 18:11:12 +01:00
2012-11-14 15:28:11 -08:00