tree a52644367533e48d9fe4f4abea0c8b39dc2523e2
parent 2044f2282d7558c765270d78e19dbdcf6190ca71
parent a197479848a2f1a2a5c07cffa6c31ab5e8c82797
author Linus Torvalds <torvalds@linux-foundation.org> 1279491210 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1279491210 -0700

Merge branch 'x86/kprobes' of git://git.kernel.org/pub/scm/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