From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 20 Feb 2009 11:15:30 +0000 (+0100)
Subject: Merge branch 'for-ingo' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg... 
X-Git-Tag: v2.6.30-rc1~2^2~90^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=057685cf57066bc8aaed68de1b1970e12f0075d2;p=pandora-kernel.git

Merge branch 'for-ingo' of git://git./linux/kernel/git/penberg/slab-2.6 into tracing/kmemtrace

Conflicts:
	mm/slub.c
---

057685cf57066bc8aaed68de1b1970e12f0075d2
Reading git-diff-tree failed