Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Nov 2014 19:28:14 +0000 (11:28 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Nov 2014 19:28:14 +0000 (11:28 -0800)
commit087b019860cc6a202d20057752e1c7e32ee20015
tree91bd3e320ec282b5beacb7eb5d02ac3264a15e3b
parent20f3963d8f48ae8309fbc777ef6787fd0a3f53c2
parent7e8631e8b9d4e9f698c09c7e7309c96249180ff9
Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs

Pull another filesystem fix from Al Viro:
 "A fix for embarrassing braino in o2net_send_tcp_msg().  -stable
  fodder..."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fix breakage in o2net_send_tcp_msg()