]> git.baikalelectronics.ru Git - kernel.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)
commitbd2c94592231ed6e5780efc1fd01f0aea138cc77
tree890ec89b55412b5f8835d0a8d22a8c973aeed036
parent378f1671af6fc20fc9f1eb31f5f2ec5bbd5d7e3a
parent4a4be5cc355e3182f720f04fb57fec07fd1a14ea
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