diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-14 19:13:22 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-14 19:13:22 +0100 |
| commit | 2205afa7d13ec716935dfd4b8ff71059ee7aeb0c (patch) | |
| tree | 19e63ed8040e8a82c3cdd331458d246247466a28 /drivers/dca | |
| parent | PCI: Global variable decls must match the defs in section attributes (diff) | |
| parent | perf sched: Fix build failure on sparc (diff) | |
| download | linux-2205afa7d13ec716935dfd4b8ff71059ee7aeb0c.tar.xz linux-2205afa7d13ec716935dfd4b8ff71059ee7aeb0c.zip | |
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf sched: Fix build failure on sparc
perf bench: Add "all" pseudo subsystem and "all" pseudo suite
perf tools: Introduce perf_session class
perf symbols: Ditch dso->find_symbol
perf symbols: Allow lookups by symbol name too
perf symbols: Add missing "Variables" entry to map_type__name
perf symbols: Add support for 'variable' symtabs
perf symbols: Introduce ELF counterparts to symbol_type__is_a
perf symbols: Introduce symbol_type__is_a
perf symbols: Rename kthreads to kmaps, using another abstraction for it
perf tools: Allow building for ARM
hw-breakpoints: Handle bad modify_user_hw_breakpoint off-case return value
perf tools: Allow cross compiling
tracing, slab: Fix no callsite ifndef CONFIG_KMEMTRACE
tracing, slab: Define kmem_cache_alloc_notrace ifdef CONFIG_TRACING
Trivial conflict due to different fixes to modify_user_hw_breakpoint()
in include/linux/hw_breakpoint.h
Diffstat (limited to 'drivers/dca')
0 files changed, 0 insertions, 0 deletions