]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'topic/uek-4.1/fuse' of git://ca-git.us.oracle.com/linux-uek into uek...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Thu, 16 Jul 2015 18:05:47 +0000 (11:05 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Thu, 16 Jul 2015 18:05:47 +0000 (11:05 -0700)
* 'topic/uek-4.1/fuse' of git://ca-git.us.oracle.com/linux-uek:
  fuse: fix typo while displaying fuse numa mount option
  fuse: add numa mount option
  fuse: modify queues, allocation and locking for multiple nodes
  fuse: add spinlock to protect fc reqctr
  fuse: add fuse node struct


Trivial merge