summaryrefslogtreecommitdiff
path: root/kernel/sched.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-04 00:29:53 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-04 00:29:53 (GMT)
commit492f59f526d95e73028f57bff475b4bbe3c8cb72 (patch)
tree8419a65de08183e350a468433fb3f4205e49ae80 /kernel/sched.c
parentf945b7abcb6cfd3106c9855aa2aa6e4396a19d76 (diff)
parent7bee946358c3cb957d4aa648fc5ab3cad0b232d0 (diff)
downloadlinux-fsl-qoriq-492f59f526d95e73028f57bff475b4bbe3c8cb72.tar.xz
Merge branch 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: locking: rename trace_softirq_[enter|exit] => lockdep_softirq_[enter|exit] lockdep: remove duplicate CONFIG_DEBUG_LOCKDEP definitions lockdep: require framepointers for x86 lockdep: remove extra "irq" string lockdep: fix incorrect state name
Diffstat (limited to 'kernel/sched.c')
0 files changed, 0 insertions, 0 deletions