Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
Linus Torvalds [Thu, 17 Mar 2011 00:21:00 +0000 (17:21 -0700)]
* 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:
  BKL: That's all, folks
  fs/locks.c: Remove stale FIXME left over from BKL conversion
  ipx: remove the BKL
  appletalk: remove the BKL
  x25: remove the BKL
  ufs: remove the BKL
  hpfs: remove the BKL
  drivers: remove extraneous includes of smp_lock.h
  tracing: don't trace the BKL
  adfs: remove the big kernel lock

12 files changed:
1  2 
drivers/staging/easycap/easycap_ioctl.c
drivers/target/target_core_transport.c
drivers/tty/pty.c
drivers/tty/tty_io.c
drivers/tty/tty_ldisc.c
drivers/tty/vt/vc_screen.c
drivers/tty/vt/vt.c
drivers/tty/vt/vt_ioctl.c
fs/ufs/namei.c
init/Kconfig
kernel/sched.c
lib/Makefile

  */
  /*****************************************************************************/
  
- #include <linux/smp_lock.h>
  #include "easycap.h"
 -#include "easycap_debug.h"
 -#include "easycap_standard.h"
 -#include "easycap_ioctl.h"
  
  /*--------------------------------------------------------------------------*/
  /*
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/ufs/namei.c
Simple merge
diff --cc init/Kconfig
Simple merge
diff --cc kernel/sched.c
Simple merge
diff --cc lib/Makefile
Simple merge