From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 31 Dec 2008 07:14:29 +0000 (+0100)
Subject: Merge branch 'linus' into tracing/kmemtrace
X-Git-Tag: v2.6.30-rc1~2^2~198^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5fdf7e5975a0b0f6a0370655612c5dca3fd6311b;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'linus' into tracing/kmemtrace

Conflicts:
	mm/slub.c
---

5fdf7e5975a0b0f6a0370655612c5dca3fd6311b