tree 5ab9fadae3611788be58eaff0d5ae205490bde8e
parent 102afa29de951a2aca93e75fa84d596c92634d05
author John Rigby <john.rigby@linaro.org> 1358974493 -0700
committer John Rigby <john.rigby@linaro.org> 1358974503 -0700

Fix rebase error introduced in 63cbf0c63b

Fixes https://bugs.launchpad.net/u-boot-linaro/+bug/1103004

Signed-off-by: John Rigby <john.rigby@linaro.org>