Merge branch 'ptrace' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into...
authorOleg Nesterov <oleg@redhat.com>
Thu, 7 Apr 2011 18:44:11 +0000 (20:44 +0200)
committerOleg Nesterov <oleg@redhat.com>
Thu, 7 Apr 2011 18:44:11 +0000 (20:44 +0200)

Trivial merge