| commit | 53d945e1a2290641ac1041e61bdd45cba34a73bd | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 19 09:12:55 2013 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 19 09:12:55 2013 -0700 |
| tree | 890ec89b55412b5f8835d0a8d22a8c973aeed036 | |
| parent | 6835039d7ed618bbac0c8c18d62d3e030b162d37 [diff] | |
| parent | 4c82456eeb4da081dd63dc69e91aa6deabd29e03 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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