Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Mar 2011 00:21:00 +0000 (17:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Mar 2011 00:21:00 +0000 (17:21 -0700)
commitf74b9444192c60603020c61d7915b72893137edc
tree8b1d16d373234038c2b045c9ceb3c33b93059e8a
parent7a6362800cb7d1d618a697a650c7aaed3eb39320
parent4ba8216cd90560bc402f52076f64d8546e8aefcb
Merge branch 'config' of git://git./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
12 files changed:
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