Adrian Danis fad4707817 Merge branch 'master' into arm_hyp ... Conflicts: src/arch/arm/head.S src/arch/arm/kernel/vspace.c		2014-07-18 14:49:54 +10:00
..
arm	Merge branch 'master' into arm_hyp	2014-07-18 14:49:54 +10:00
ia32/arch	Release snapshot	2014-07-18 05:03:59 +10:00