]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6e5565f ef1fc2f)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 7 Feb 2008 21:21:02 +0000 (13:21 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 7 Feb 2008 21:21:02 +0000 (13:21 -0800)
* '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


Trivial merge
Linux 2.6 source tree