projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2044f22 a197479)
Merge branch 'x86/kprobes' of git://git.kernel.org/pub/scm/linux/kernel/git/frob...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 18 Jul 2010 22:13:30 +0000 (15:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 18 Jul 2010 22:13:30 +0000 (15:13 -0700)
* '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


Trivial merge
John Crispins staging tree