Merge tag 'v3.3-rc7' into sched/core
authorIngo Molnar <mingo@elte.hu>
Tue, 13 Mar 2012 15:26:52 +0000 (16:26 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 13 Mar 2012 15:26:52 +0000 (16:26 +0100)
commit47258cf3c4aa5d56e678bafe0dd0d03ddd980b88
tree4856f0fb1185ba97f320a7ed6fb63bf136708a42
parentc308b56b5398779cd3da0f62ab26b0453494c3d4
parentfde7d9049e55ab85a390be7f415d74c9f62dd0f9
Merge tag 'v3.3-rc7' into sched/core

Merge reason: merge back final fixes, prepare for the merge window.

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