tree 2895f1b2c2aa0d2df792aee8afc8e4d4e691fe5c
parent 497b5b13c9e946651991e0296374a15d38590ce1
parent 7572777eef78ebdee1ecb7c258c0ef94d35bad16
author Linus Torvalds <torvalds@linux-foundation.org> 1292353659 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1292353659 -0800

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