From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Wed, 12 May 2010 21:19:01 +0000 (+0200)
Subject: Merge commit 'v2.6.34-rc7' into perf/nmi
X-Git-Tag: v2.6.36-rc1~532^2~1^2~18
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9aa1d02de36b450990b0e25a88fc2ff1c3e6b94;p=pandora-kernel.git

Merge commit 'v2.6.34-rc7' into perf/nmi

Merge reason: catch up with latest softlockup detector changes.
---

a9aa1d02de36b450990b0e25a88fc2ff1c3e6b94
Reading git-diff-tree failed