]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Apr 2013 16:12:55 +0000 (09:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Apr 2013 16:12:55 +0000 (09:12 -0700)
commit53d945e1a2290641ac1041e61bdd45cba34a73bd
tree890ec89b55412b5f8835d0a8d22a8c973aeed036
parent6835039d7ed618bbac0c8c18d62d3e030b162d37
parent4c82456eeb4da081dd63dc69e91aa6deabd29e03
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