Merge commit '3cf2f34' into sched/core, to fix build error
authorIngo Molnar <mingo@kernel.org>
Thu, 12 Jun 2014 11:46:25 +0000 (13:46 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 12 Jun 2014 11:46:37 +0000 (13:46 +0200)
Fix this dependency on the locking tree's smp_mb*() API changes:

  kernel/sched/idle.c:247:3: error: implicit declaration of function ‘smp_mb__after_atomic’ [-Werror=implicit-function-declaration]

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

Trivial merge