From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Apr 2013 16:12:55 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=53d945e1a2290641ac1041e61bdd45cba34a73bd;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'for-linus' of git://git./linux/kernel/git/mszeredi/fuse

Pull fuse build fix from Miklos Szeredi:
 "This fixes android builds.  The patch appears large, but is just
  search & replace."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: fix type definitions in uapi header
---

53d945e1a2290641ac1041e61bdd45cba34a73bd