| commit | 44744bb344abe032b387d361209038d2956e8c75 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Aug 24 16:16:55 2014 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Aug 24 16:16:55 2014 -0700 |
| tree | e5b4eec5a313c9ee9b7b0f22ce3ba77970ea17e0 | |
| parent | 959dc2587d69f77af9de63199bd2dc468a736595 [diff] | |
| parent | b3f207855f57b9c8f43a547a801340bb5cbc59e5 [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: "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