From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 21 Jul 2008 15:19:50 +0000 (+0200)
Subject: Merge branch 'linus' into cpus4096-for-linus
X-Git-Tag: v2.6.27-rc1~848^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb6a12c2428d21a9f3e0f1a50e927d5fd80fc3d0;p=pandora-kernel.git

Merge branch 'linus' into cpus4096-for-linus

Conflicts:

	net/sunrpc/svc.c

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

eb6a12c2428d21a9f3e0f1a50e927d5fd80fc3d0
Reading git-diff-tree failed