| commit | 963649d735c8b6eb0f97e82c54f02426ff3f1f45 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jun 08 14:35:19 2014 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jun 08 14:35:19 2014 -0700 |
| tree | ba718c456efbcf7a9564a60db1b8bebb961e7889 | |
| parent | 1662867a9b2574bfdb9d4e97186aa131218d7210 [diff] | |
| parent | f15844e0777fec936f87a87f97394f83911dacd3 [diff] |
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