Since long ago in the arm world there is nearly the same picture as we are faced now with
linux-next. Russell puts patches in several branches as he finds usefull and then merged them
into single tree. For managing development in such configuration I found extremly usefull to
use guilt by jsipek. It's like quilt, but with full git integration.