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: v2.6.37-rc6~31 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=073f21ae1319348f4f8630003b7901e3be254327;p=~emulex%2Finfiniband.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