]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'for-linus-3.16-merge-window' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 Jun 2014 21:35:19 +0000 (14:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 Jun 2014 21:35:19 +0000 (14:35 -0700)
commit8839b40f27a93a3557e0f1ad9bae7e905b681711
treeba718c456efbcf7a9564a60db1b8bebb961e7889
parent12aec90e12720bb0bd1aec70ba9b49bd4d7ec177
parent8ee3f6c838a16f7dba1b0b088ef061370e9d9c91
Merge tag 'for-linus-3.16-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs

Pull 9p fixes from Eric Van Hensbergen:
 "Two bug fixes, one in xattr error path and the other in parsing
  major/minor numbers from devices"

* tag 'for-linus-3.16-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  9P: fix return value in v9fs_fid_xattr_set
  fs/9p: adjust sscanf parameters accordingly to the variable types
fs/9p/vfs_inode.c