From: Linus Torvalds <torvalds@linux-foundation.org>
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: upstream/snapshot3+hdmi~13886
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a9f7f2e74ae0e6a801a2433dc8e9124d73da0cb4;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.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