From: Linus Torvalds Date: Sun, 18 Jul 2010 22:13:30 +0000 (-0700) Subject: Merge branch 'x86/kprobes' of git://git.kernel.org/pub/scm/linux/kernel/git/frob... X-Git-Tag: firefly_0821_release~9833^2~1405 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a9f7f2e74ae0e6a801a2433dc8e9124d73da0cb4;p=firefly-linux-kernel-4.4.55.git Merge branch 'x86/kprobes' of git://git./linux/kernel/git/frob/linux-2.6-roland * 'x86/kprobes' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland: x86: kprobes: fix swapped segment registers in kretprobe --- a9f7f2e74ae0e6a801a2433dc8e9124d73da0cb4