From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 17 May 2010 20:48:10 +0000 (-0700)
Subject: Merge branch 'bkl/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic... 
X-Git-Tag: v2.6.35-rc1~531
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3d2c978e0cd8b1157f9eebd13062d61fb7a75ad5;p=platform%2Fkernel%2Flinux-3.10.git

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
---

3d2c978e0cd8b1157f9eebd13062d61fb7a75ad5