From: Linus Torvalds Date: Tue, 14 Dec 2010 19:07:39 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi... X-Git-Tag: Ubuntu-5.0.0-8.9~20894 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=073f21ae1319348f4f8630003b7901e3be254327;p=mirror_ubuntu-disco-kernel.git Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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 --- 073f21ae1319348f4f8630003b7901e3be254327