summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-18 10:11:06 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-18 10:11:06 -0700
commitee3af6ee77f61cac3c8f770c65736bf5ed03a697 (patch)
treea4803f26484914d55086c15b7a0234a2d38ce7b2 /kernel
parent13bba6fda98fe03a955665c9d4bf63c8fd9c19c0 (diff)
parent92d23f703c608fcb2c8edd74a3fd0f4031e18606 (diff)
parentd80c19df5fcceb8c741e96f09f275c2da719efef (diff)
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