Merge branch 'core-lib-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull core/lib update from Ingo Molnar:
 "This contains a single commit that removes an unused facility that the
  scheduler used to make use of"

* 'core-lib-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  lib/proportions: Remove unused code

diff --cc include/linux/sched.h
Simple merge