Merge commit 'v3.2-rc5' into sched/core
authorIngo Molnar <mingo@elte.hu>
Thu, 15 Dec 2011 07:21:21 +0000 (08:21 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 15 Dec 2011 07:21:30 +0000 (08:21 +0100)
commit6a54aebf6978e9f296a4d3da3e40af425163c22e
tree8217c7114db02d8b69c22fc44880749426949bc3
parent067491b7313c41f49607fce782d29344d1472587
parentdc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50
Merge commit 'v3.2-rc5' into sched/core

Merge reason: Pick up the latest fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
fs/proc/stat.c
include/linux/sched.h