diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-05 19:11:11 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-05 19:11:11 +0200 |
commit | f9ba7179ce91fb77b2adf6eaab3676ab3a1f5a15 (patch) | |
tree | 2d02e7a4fd78083b78749d0c9c7466f0eb8e6f97 /include/drm/i915_drm.h | |
parent | Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
parent | fuse: fix blksize calculation (diff) | |
download | linux-f9ba7179ce91fb77b2adf6eaab3676ab3a1f5a15.tar.xz linux-f9ba7179ce91fb77b2adf6eaab3676ab3a1f5a15.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
Pull fuse updates from Miklos Szeredi.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
fuse: fix blksize calculation
fuse: fix stat call on 32 bit platforms
fuse: optimize fallocate on permanent failure
fuse: add FALLOCATE operation
fuse: Convert to kstrtoul_from_user
Diffstat (limited to 'include/drm/i915_drm.h')
0 files changed, 0 insertions, 0 deletions