| commit | 2fd1b487884310d0aa0c0640179dc7490ad86313 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Mon Jul 01 11:16:54 2013 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Mon Jul 01 11:18:53 2013 +0200 |
| tree | 1083dce15bd7dc0858c3883b8a361242046c5e09 | |
| parent | 333bb864f192015a53b5060b829089decd0220ef [diff] | |
| parent | 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 [diff] |
Merge tag 'v3.10' into sched/core Merge in a recent upstream commit: c2853c8df57f include/linux/math64.h: add div64_ul() because: 72a4cf20cb71 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>