Merge branch 'linus' into sched/core
authorIngo Molnar <mingo@kernel.org>
Mon, 7 May 2012 13:03:39 +0000 (15:03 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 7 May 2012 13:03:42 +0000 (15:03 +0200)
commit436281c9a110ff16c1fb396add5dd944ee92cf36
treeafda86db9e89d41ca49a8311673b994a82d16d42
parent4cbb62148cd686c2d3618861deb15eeb83744405
parentfebb72a6e4cc6c8cffcc1ea649a3fb364f1ea432
Merge branch 'linus' into sched/core

Merge reason: We were on a pretty old base, refresh before moving on.

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