From: Linus Torvalds Date: Sat, 21 Feb 2015 18:39:16 +0000 (-0800) Subject: Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v4.0-rc1~26 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5aeca54d0212515d820e5555115e2fc7847a68b;p=thirdparty%2Flinux.git Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull x86 uprobe/kprobe fixes from Ingo Molnar: "This contains two uprobes fixes, an uprobes comment update and a kprobes fix" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: kprobes/x86: Mark 2 bytes NOP as boostable uprobes/x86: Fix 2-byte opcode table uprobes/x86: Fix 1-byte opcode tables uprobes/x86: Add comment with insn opcodes, mnemonics and why we dont support them --- b5aeca54d0212515d820e5555115e2fc7847a68b