Borislav Petkov 5f870a3f71 x86/thread_info: Merge two !__ASSEMBLY__ sections ... We have #ifndef __ASSEMBLY__ ... #endif #ifndef __ASSEMBLY__ ... #endif Merge the two. No functionality change. Signed-off-by: Borislav Petkov <bp@suse.de> Link: http://lkml.kernel.org/r/1459189217-25532-1-git-send-email-bp@alien8.de Signed-off-by: Thomas Gleixner <tglx@linutronix.de>		2016-03-29 11:12:10 +02:00
..
asm	x86/thread_info: Merge two !__ASSEMBLY__ sections	2016-03-29 11:12:10 +02:00
uapi/asm	Merge branch 'mm-pkeys-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-03-20 19:08:56 -07:00