projects / profile / common / kernel-common.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 13bba6f 92d23f7 d80c19d)
Merge branches 'sched-fixes-for-linus-2' and 'core-fixes-for-linus-2' of git://git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 May 2009 17:11:06 +0000 (10:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 May 2009 17:11:06 +0000 (10:11 -0700)
* 'sched-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: Fix fallback sched_clock()'s offset when using jiffies

* 'core-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  lockdep: increase MAX_LOCKDEP_ENTRIES and MAX_LOCKDEP_CHAINS


Trivial merge
Domain: SCM / Uncategorized;