aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <[email protected]>2008-11-18 16:06:35 +0000
committerLinus Torvalds <[email protected]>2008-11-18 16:06:35 +0000
commit72b51a6b4d803381f16d819df392dd1efd1c7181 (patch)
tree7e27a03c10cb2f5e6593dd599b3c8b0bcd0f9ee9 /net
parentMerge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff)
parentkernel/profile.c: fix section mismatch warning (diff)
downloadkernel-72b51a6b4d803381f16d819df392dd1efd1c7181.tar.gz
kernel-72b51a6b4d803381f16d819df392dd1efd1c7181.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: kernel/profile.c: fix section mismatch warning function tracing: fix wrong pos computing when read buffer has been fulfilled tracing: fix mmiotrace resizing crash ring-buffer: no preempt for sched_clock() ring-buffer: buffer record on/off switch
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions