Merge branch 'linus' into core/debug

Conflicts:
	lib/vsprintf.c

Manual merge:

	include/linux/kernel.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc include/linux/kernel.h
index 4e1366b552ae9356bd234cc355105321a57d46b8,2651f805ba6d771b9ec1f26078609aebdb198853..3f30557be2a3f2e209a2abd60c21ddef9086fc96
--- 1/include/linux/kernel.h
--- 2/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@@ -187,9 -187,6 +187,8 @@@ extern unsigned long long memparse(cha
  extern int core_kernel_text(unsigned long addr);
  extern int __kernel_text_address(unsigned long addr);
  extern int kernel_text_address(unsigned long addr);
- extern void *dereference_function_descriptor(void *ptr);
 +extern int func_ptr_is_kernel_text(void *ptr);
 +
  struct pid;
  extern struct pid *session_of_pgrp(struct pid *pgrp);
  

diff --cc kernel/softlockup.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge