git.maquefel.me Git - linux.git/commit

author	H. Peter Anvin <hpa@linux.intel.com>
	Thu, 22 May 2014 00:36:33 +0000 (17:36 -0700)
committer	H. Peter Anvin <hpa@linux.intel.com>
	Thu, 22 May 2014 00:36:33 +0000 (17:36 -0700)
commit	03c1b4e8e560455a2634a76998883a22f1a01207
tree	30ca1237d094d66df1dc1533f7bf39b3877b5932	tree \| snapshot
parent	ac49b9a9f26b6c42585f87857722085ef4b19c13	commit \| diff
parent	e6ab9a20e73e790d47e6aa231fcf66f27b6ce3d4	commit \| diff

Merge remote-tracking branch 'origin/x86/espfix' into x86/vdso

Merge x86/espfix into x86/vdso, due to changes in the vdso setup code
that otherwise cause conflicts.

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

arch/x86/kernel/hpet.c	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

arch/x86/kernel/hpet.c	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	diff1 \|	diff2 \|	blob \| history