Merge branch 'bkl/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
Linus Torvalds [Sun, 8 Aug 2010 00:06:54 +0000 (17:06 -0700)]
* 'bkl/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
  do_coredump: Do not take BKL
  init: Remove the BKL from startup code

1  2 
fs/exec.c
init/main.c
kernel/trace/trace.c

diff --cc fs/exec.c
Simple merge
diff --cc init/main.c
Simple merge
Simple merge