summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorLinus Torvalds2008-10-30 19:44:09 +0100
committerLinus Torvalds2008-10-30 19:44:09 +0100
commit0b54968f667585aa4b98a7225f4d4df63917703c (patch)
tree6d354dade8bfe96f00bbba55eaf3c87fc9593fe4 /include/media
parentspi: fix compile error (diff)
parentftrace: fix trace_nop config select (diff)
downloadkernel-qcow2-linux-0b54968f667585aa4b98a7225f4d4df63917703c.tar.gz
kernel-qcow2-linux-0b54968f667585aa4b98a7225f4d4df63917703c.tar.xz
kernel-qcow2-linux-0b54968f667585aa4b98a7225f4d4df63917703c.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 trace_nop config select ftrace: perform an initialization for ftrace to enable it
Diffstat (limited to 'include/media')
0 files changed, 0 insertions, 0 deletions