diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-25 03:16:55 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-25 03:16:55 +0400 |
| commit | 44744bb344abe032b387d361209038d2956e8c75 (patch) | |
| tree | e5b4eec5a313c9ee9b7b0f22ce3ba77970ea17e0 /mm/memblock.c | |
| parent | 959dc2587d69f77af9de63199bd2dc468a736595 (diff) | |
| parent | b3f207855f57b9c8f43a547a801340bb5cbc59e5 (diff) | |
| download | linux-44744bb344abe032b387d361209038d2956e8c75.tar.xz | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"A kprobes and a perf compat ioctl fix"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf: Handle compat ioctl
kprobes: Skip kretprobe hit in NMI context to avoid deadlock
Diffstat (limited to 'mm/memblock.c')
0 files changed, 0 insertions, 0 deletions