projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1662867 f15844e)
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)
commit963649d735c8b6eb0f97e82c54f02426ff3f1f45
treeba718c456efbcf7a9564a60db1b8bebb961e7889tree | snapshot (tar.gz zip)
parent1662867a9b2574bfdb9d4e97186aa131218d7210commit | diff
parentf15844e0777fec936f87a87f97394f83911dacd3commit | diff
Merge tag 'for-linus-3.16-merge-window' of git://git./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 diff1 | diff2 | blob | history