tree 0a981b24173e90854e7b7d812b35859e1e5f0174
parent 91151240ed8e97cc4457dae4094153c2744f1eb8
parent 6de5bd128d381ad88ac6d419a5e597048eb468cf
author Linus Torvalds <torvalds@linux-foundation.org> 1287769391 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1287769391 -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: introduce CONFIG_BKL.
  dabusb: remove the BKL
  sunrpc: remove the big kernel lock
  init/main.c: remove BKL notations
  blktrace: remove the big kernel lock
  rtmutex-tester: make it build without BKL
  dvb-core: kill the big kernel lock
  dvb/bt8xx: kill the big kernel lock
  tlclk: remove big kernel lock
  fix rawctl compat ioctls breakage on amd64 and itanic
  uml: kill big kernel lock
  parisc: remove big kernel lock
  cris: autoconvert trivial BKL users
  alpha: kill big kernel lock
  isapnp: BKL removal
  s390/block: kill the big kernel lock
  hpet: kill BKL, add compat_ioctl