| commit | 073f21ae1319348f4f8630003b7901e3be254327 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 14 Dec 2010 19:07:39 +0000 (14 11:07 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 14 Dec 2010 19:07:39 +0000 (14 11:07 -0800) | ||
| tree | 2895f1b2c2aa0d2df792aee8afc8e4d4e691fe5c | treesnapshot (tar.gz zip) |
| parent | 497b5b13c9e946651991e0296374a15d38590ce1 | commitdiff |
| parent | 7572777eef78ebdee1ecb7c258c0ef94d35bad16 | commitdiff |
Merge branch 'for-linus' of git://git./linux/kernel/git/mszeredi/fuse
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
fuse: verify ioctl retries
fuse: fix ioctl when server is 32bit
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
fuse: verify ioctl retries
fuse: fix ioctl when server is 32bit