Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 2fd1b487 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'v3.10' into sched/core



Merge in a recent upstream commit:

  c2853c8d include/linux/math64.h: add div64_ul()

because:

  72a4cf20 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: default avatarIngo Molnar <mingo@kernel.org>
parents 333bb864 8bb495e3
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment