]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit5929583b55b435013a636ad0ea5701c8b8bcac0e
treea4803f26484914d55086c15b7a0234a2d38ce7b2
parent54ca0b6c3decece4ddf67cebb3470eb4f5c411bd
parent05d95faf8d679db71cedfc51ea811b02ff7e605f
parent938c1bfc6dd0094b0a76e248cef03941c814aac6
Merge branches 'sched-fixes-for-linus-2' and 'core-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

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