diff options
author | 2008-10-30 11:44:09 -0700 | |
---|---|---|
committer | 2008-10-30 11:44:09 -0700 | |
commit | 0b54968f667585aa4b98a7225f4d4df63917703c (patch) | |
tree | 6d354dade8bfe96f00bbba55eaf3c87fc9593fe4 /include/linux/pci.h | |
parent | spi: fix compile error (diff) | |
parent | ftrace: fix trace_nop config select (diff) | |
download | linux-dev-0b54968f667585aa4b98a7225f4d4df63917703c.tar.xz linux-dev-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/linux/pci.h')
0 files changed, 0 insertions, 0 deletions