From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 10 Sep 2008 07:09:51 +0000 (+0200)
Subject: Merge branch 'linus' into core/debug
X-Git-Tag: v2.6.29-rc1~572^2~4^2
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=6003ab0bad4cc56f3c4fadf62a0d23a967b9c53b;p=linux-2.6-omap-h63xx.git

Merge branch 'linus' into core/debug

Conflicts:
	lib/vsprintf.c

Manual merge:

	include/linux/kernel.h

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

6003ab0bad4cc56f3c4fadf62a0d23a967b9c53b
diff --cc include/linux/kernel.h
index 4e1366b552a,2651f805ba6..3f30557be2a
--- a/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 int func_ptr_is_kernel_text(void *ptr);
- extern void *dereference_function_descriptor(void *ptr);
 +
  struct pid;
  extern struct pid *session_of_pgrp(struct pid *pgrp);