diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-07 15:12:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-07 15:12:18 -0700 |
| commit | c593e8978722f7f4a12932733cfeed6c0c74fbaa (patch) | |
| tree | 364ad0542f0208b161ad848281273354e6fc037d /drivers/video/logo | |
| parent | 052e5c7e28cc22017f9ad3f67026f911fdfc2edc (diff) | |
| parent | 01a9a8a9e20012f5676ec9cd16b6aed08b267066 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'drivers/video/logo')
0 files changed, 0 insertions, 0 deletions