aboutsummaryrefslogtreecommitdiff
path: root/arch/m68k
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-07 13:21:02 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-07 13:21:02 -0800
commitdf922075f2a55b1ae71a6fe589c1cc1b91381f4f (patch)
treed0967cdb5b20d2da7e669522a5e450616697f180 /arch/m68k
parent6e5565f949af1322f8f3d3f43d044645ae448499 (diff)
parentef1fc2f01e02951a0d8520ec3aa0b38606d74b55 (diff)
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
Diffstat (limited to 'arch/m68k')
0 files changed, 0 insertions, 0 deletions