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://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6003ab0bad4cc56f3c4fadf62a0d23a967b9c53b;p=pandora-kernel.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
Reading git-diff-tree failed