From: Angus Gratton <angus@espressif.com>
Date: Tue, 10 Apr 2018 04:14:57 +0000 (+0800)
Subject: Merge branch 'bugfix/heap_fragmentation_on_split_pr1761' into 'master'
X-Git-Tag: v3.1-beta1~280
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2914111c8cd9024d29e7670fdb648b4444f85525;p=esp-idf

Merge branch 'bugfix/heap_fragmentation_on_split_pr1761' into 'master'

heap: Try to merge tail with next block when splitting

See merge request idf/esp-idf!2147
---

2914111c8cd9024d29e7670fdb648b4444f85525