]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'v3.10' into sched/core
authorIngo Molnar <mingo@kernel.org>
Mon, 1 Jul 2013 09:16:54 +0000 (11:16 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 1 Jul 2013 09:18:53 +0000 (11:18 +0200)
commit5c409f6e83348a26a1b4eaeb451c285d309d3bd9
tree1083dce15bd7dc0858c3883b8a361242046c5e09
parenteecf38568919d3c19a6d5c2261e2813c477e4531
parentc96b444416394b316b552bc74f4b1ab4c64a5781
Merge tag 'v3.10' into sched/core

Merge in a recent upstream commit:

  608bae2bfbd6 include/linux/math64.h: add div64_ul()

because:

  e6d15a3d7688 sched: Change cfs_rq load avg to unsigned long

relies on it.

[ We don't rebase sched/core for this, because the handful of
  followup commits after the broken commit are not behavioral
  changes so are unlikely to be needed during bisection. ]

Signed-off-by: Ingo Molnar <mingo@kernel.org>
include/linux/perf_event.h
kernel/sched/core.c
kernel/sched/cputime.c