From: Ingo Molnar <mingo@kernel.org>
Date: Mon, 1 Jul 2013 09:16:54 +0000 (+0200)
Subject: Merge tag 'v3.10' into sched/core
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2fd1b487884310d0aa0c0640179dc7490ad86313;p=linux-beck.git

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

2fd1b487884310d0aa0c0640179dc7490ad86313