From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 12 Aug 2010 19:38:56 +0000 (+0200)
Subject: Merge branch 'linus' into perf/urgent
X-Git-Tag: v2.6.36-rc1~41^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=f46a6804135795f77d096ab0128f27531c7d051c;p=linux.git

Merge branch 'linus' into perf/urgent

Merge reason: Fix upstream breakage introduced by:

 de5d9bf: Move list types from <linux/list.h> to <linux/types.h>.

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

f46a6804135795f77d096ab0128f27531c7d051c