summaryrefslogtreecommitdiffstats
path: root/drivers/isdn
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-26 22:25:47 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-26 22:25:47 +0200
commita048d3aff8b828b6c0fa7ddd90a531248ab4e0f9 (patch)
tree8edfb5bd152aef0d48c4a165247906db347c3a56 /drivers/isdn
parentMerge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff)
parentftrace: fix modular build (diff)
downloadlinux-a048d3aff8b828b6c0fa7ddd90a531248ab4e0f9.tar.xz
linux-a048d3aff8b828b6c0fa7ddd90a531248ab4e0f9.zip
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: ftrace: fix modular build ftrace: disable tracing on acpi idle calls ftrace: remove latency-tracer leftover ftrace: only trace preempt off with preempt tracer ftrace: fix 4d3702b6 (post-v2.6.26): WARNING: at kernel/lockdep.c:2731 check_flags (ftrace)
Diffstat (limited to 'drivers/isdn')
0 files changed, 0 insertions, 0 deletions