Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Mar 2009 18:31:47 +0000 (11:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Mar 2009 18:31:47 +0000 (11:31 -0700)
commit2d25ee36c84d5b2d6be8bfaf80256ecad69a06ca
tree4e8fff4b3de41cec400385fdadd143c8d5d91904
parent915db32ddbc967f023fbf7d7f01cca9e05606a9b
parent4a6a4499693a419a20559c41e33a7bd70bf20a6f
Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6

* 'bkl-removal' of git://git.lwn.net/linux-2.6:
  Fix a lockdep warning in fasync_helper()
  Add a missing unlock_kernel() in raw_open()
include/linux/fs.h