tree d0967cdb5b20d2da7e669522a5e450616697f180
parent 6e5565f949af1322f8f3d3f43d044645ae448499
parent ef1fc2f01e02951a0d8520ec3aa0b38606d74b55
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1202419262 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1202419262 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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