projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 81880d6 b8bc138)
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)
* '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


Trivial merge
John Crispins staging tree