Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

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

diff --cc drivers/staging/easycap/easycap_ioctl.c
index 64e7ecd,c1a0c9c..28a28e0
--- 1/drivers/staging/easycap/easycap_ioctl.c
--- 2/drivers/staging/easycap/easycap_ioctl.c
+++ b/drivers/staging/easycap/easycap_ioctl.c
@@@ -25,8 -25,10 +25,7 @@@
  */
  /*****************************************************************************/
  
- #include <linux/smp_lock.h>
  #include "easycap.h"
 -#include "easycap_debug.h"
 -#include "easycap_standard.h"
 -#include "easycap_ioctl.h"
  
  /*--------------------------------------------------------------------------*/
  /*

diff --cc drivers/target/target_core_transport.c
Simple merge

diff --cc drivers/tty/pty.c
Simple merge

diff --cc drivers/tty/tty_io.c
Simple merge

diff --cc drivers/tty/tty_ldisc.c
Simple merge

diff --cc drivers/tty/vt/vc_screen.c
Simple merge

diff --cc drivers/tty/vt/vt.c
Simple merge

diff --cc drivers/tty/vt/vt_ioctl.c
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