| commit | a9f7f2e74ae0e6a801a2433dc8e9124d73da0cb4 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jul 18 15:13:30 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jul 18 15:13:30 2010 -0700 |
| tree | a52644367533e48d9fe4f4abea0c8b39dc2523e2 | |
| parent | 2044f2282d7558c765270d78e19dbdcf6190ca71 [diff] | |
| parent | a197479848a2f1a2a5c07cffa6c31ab5e8c82797 [diff] |
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