Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
commitdf922075f2a55b1ae71a6fe589c1cc1b91381f4f
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 7 Feb 2008 21:21:02 +0000 (7 13:21 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 7 Feb 2008 21:21:02 +0000 (7 13:21 -0800)
treed0967cdb5b20d2da7e669522a5e450616697f180
parent6e5565f949af1322f8f3d3f43d044645ae448499
parentef1fc2f01e02951a0d8520ec3aa0b38606d74b55
Merge branch 'for-linus' of git://git./linux/kernel/git/shaggy/jfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
  BKL-removal: Implement a compat_ioctl handler for JFS
  BKL-removal: Use unlocked_ioctl for jfs