projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 052e5c7 01a9a8a)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Jun 2014 22:12:18 +0000 (15:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Jun 2014 22:12:18 +0000 (15:12 -0700)
commitc593e8978722f7f4a12932733cfeed6c0c74fbaa
tree364ad0542f0208b161ad848281273354e6fc037dtree | snapshot (tar.gz zip)
parent052e5c7e28cc22017f9ad3f67026f911fdfc2edccommit | diff
parent01a9a8a9e20012f5676ec9cd16b6aed08b267066commit | diff
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