Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Oct 2008 20:42:14 +0000 (13:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Oct 2008 20:42:14 +0000 (13:42 -0700)
commit2bea2e4abf2fe8bc7384103aeaad91089109cfba
tree3f7cf9712fa8998213bf2f7ed97b40e65946cd92
parenta0bfb673dca8a2b4324fe11e678ec6d6a9ad67e0
parent0d4a7bc12ffecd3ba41dd94179cc5b272b71ce8a
Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6

* 'bkl-removal' of git://git.lwn.net/linux-2.6:
  UIO: BKL removal
drivers/uio/uio.c