From: Brian Behlendorf <behlendorf1@llnl.gov>
Subject: [PATCH] fix-branch

<patch description>

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>