From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 7 Feb 2008 21:21:02 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy... 
X-Git-Tag: v2.6.25-rc1~290
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=df922075f2a55b1ae71a6fe589c1cc1b91381f4f;p=linux-2.6-omap-h63xx.git

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
---

df922075f2a55b1ae71a6fe589c1cc1b91381f4f