diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-06 11:54:33 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-06 11:54:33 -0800 |
commit | 091c0f86bad6bb0b003dff2f6195508e29548648 (patch) | |
tree | d04ef2b42ae456c2f281728413405c2e6af34880 /drivers/net/Kconfig | |
parent | 4fb1db334aa2569281481a09840650e7be28161d (diff) | |
parent | ddf6e0e50723b62ac76ed18eb53e9417c6eefba7 (diff) | |
download | linux-091c0f86bad6bb0b003dff2f6195508e29548648.tar.bz2 |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
ftrace: Fix hash record accounting bug
perf: Fix parsing of __print_flags() in TP_printk()
jump_label: jump_label_inc may return before the code is patched
ftrace: Remove force undef config value left for testing
tracing: Restore system filter behavior
tracing: fix event_subsystem ref counting
Diffstat (limited to 'drivers/net/Kconfig')
0 files changed, 0 insertions, 0 deletions