Ingo Molnar 2fd1b48788 Merge tag 'v3.10' into sched/core ...

Merge in a recent upstream commit:

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

because:

  72a4cf20cb 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>

2013-07-01 11:18:53 +02:00

21 KiB

Raw Blame History

View Raw