]> rtime.felk.cvut.cz Git - lisovros/linux_canprio.git/commitdiff
Merge branch 'core/iter-div' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Jun 2008 14:47:44 +0000 (07:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Jun 2008 14:47:44 +0000 (07:47 -0700)
* 'core/iter-div' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  always_inline timespec_add_ns
  add an inlined version of iter_div_u64_rem
  common implementation of iterative div/mod


Trivial merge