From: Ingo Molnar <mingo@kernel.org>
Date: Wed, 25 Jul 2012 19:40:40 +0000 (+0200)
Subject: Merge branch 'linus' into x86/urgent
X-Git-Tag: v3.6-rc2~36^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d431adfbc9b7de651f3164c6b7ffcad75805d7e4;p=pandora-kernel.git

Merge branch 'linus' into x86/urgent

Merge in Linus's tree to avoid a conflict.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

d431adfbc9b7de651f3164c6b7ffcad75805d7e4
Reading git-diff-tree failed