Ingo Molnar 2b45e0f9f3 Merge branch 'linus' into x86/urgent ... Merge in the x86 changes to apply a fix. Signed-off-by: Ingo Molnar <mingo@kernel.org>		2014-01-25 09:16:14 +01:00
..
asm	Merge branch 'linus' into x86/urgent	2014-01-25 09:16:14 +01:00
uapi/asm	Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-01-20 15:12:49 -08:00