Merge branch 'bkl/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 May 2010 20:48:10 +0000 (13:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 May 2010 20:48:10 +0000 (13:48 -0700)
commit3d2c978e0cd8b1157f9eebd13062d61fb7a75ad5
treed7e221e70d14aae2b4e5972ed9715a2cb18a3b98
parent81880d603d00c645e0890d0a44d50711c503b72b
parentb8bc1389b74c2b66255651a6fcfae56c78b6e63f
Merge branch 'bkl/core' of git://git./linux/kernel/git/frederic/random-tracing

* 'bkl/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
  ptrace: Cleanup useless header
  ptrace: kill BKL in ptrace syscall