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: v2.6.32-rc1~719^2~50
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5304d5fc74a269cc6c3e70f9713684ca729abdf0;p=users%2Fhch%2Fuuid.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