tree 8b1d16d373234038c2b045c9ceb3c33b93059e8a
parent 7a6362800cb7d1d618a697a650c7aaed3eb39320
parent 4ba8216cd90560bc402f52076f64d8546e8aefcb
author Linus Torvalds <torvalds@linux-foundation.org> 1300321260 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1300321260 -0700

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