diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 13:21:02 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 13:21:02 -0800 |
commit | df922075f2a55b1ae71a6fe589c1cc1b91381f4f (patch) | |
tree | d0967cdb5b20d2da7e669522a5e450616697f180 /include/linux/dmi.h | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input (diff) | |
parent | BKL-removal: Implement a compat_ioctl handler for JFS (diff) | |
download | linux-dev-df922075f2a55b1ae71a6fe589c1cc1b91381f4f.tar.xz linux-dev-df922075f2a55b1ae71a6fe589c1cc1b91381f4f.zip |
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 'include/linux/dmi.h')
0 files changed, 0 insertions, 0 deletions