From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 18 Jul 2009 13:50:22 +0000 (+0200)
Subject: Merge branch 'linus' into sched/core
X-Git-Tag: MMI-PSA29.97-13-9~26992^2~50
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5304d5fc74a269cc6c3e70f9713684ca729abdf0;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'linus' into sched/core

Merge reason: branch had an old upstream base (-rc1-ish), but also
              merge to avoid a conflict.

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

5304d5fc74a269cc6c3e70f9713684ca729abdf0