From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 7 Jun 2014 22:12:18 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux... 
X-Git-Tag: MMI-PSA29.97-13-9~12130
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c593e8978722f7f4a12932733cfeed6c0c74fbaa;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'for-linus' of git://git./linux/kernel/git/mason/linux-btrfs

Pull btrfs fix from Chris Mason:
 "I had this in my 3.16 merge window queue, but it is small and obvious
  enough for 3.15.  I cherry-picked and retested against current rc8"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: send, fix corrupted path strings for long paths
---

c593e8978722f7f4a12932733cfeed6c0c74fbaa