From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 8 Jun 2014 21:35:19 +0000 (-0700)
Subject: Merge tag 'for-linus-3.16-merge-window' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=963649d735c8b6eb0f97e82c54f02426ff3f1f45;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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
---

963649d735c8b6eb0f97e82c54f02426ff3f1f45