diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-15 15:38:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-15 15:38:21 -0400 |
| commit | ef4a293a4417fc5f50b0b83b62deb9ead8423256 (patch) | |
| tree | 310e15624ef6e88545727cbef7ccc2832f87ccbc /kernel/user_namespace.c | |
| parent | 214e9f723e7581c7c51677bdf382cb678d850a9f (diff) | |
| parent | 60d5ddeabdda2d6453280efcf172d2429da10eac (diff) | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"Mostly tooling fixes, but also a lockdep annotation fix, a PMU event
list fix and a new model addition"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
tools/liblockdep: Fix compilation error
tools/liblockdep: Fix linker error in case of cross compile
perf tools: Use getconf to determine number of online CPUs
tools: Fix tools/vm build
perf/x86/rapl: Enable Broadwell-U RAPL support
perf/x86/intel: Fix SLM cache event list
perf: Annotate inherited event ctx->mutex recursion
Diffstat (limited to 'kernel/user_namespace.c')
0 files changed, 0 insertions, 0 deletions