Merge branch 'master' of git://git.denx.de/u-boot-net
diff --git a/Makefile b/Makefile
index 1625743..c66bd2f 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
VERSION = 2016
PATCHLEVEL = 09
SUBLEVEL =
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc2
NAME =
# *DOCUMENTATION*
diff --git a/test/fs/fs-test.sh b/test/fs/fs-test.sh
index 043e5d0..93679cb 100755
--- a/test/fs/fs-test.sh
+++ b/test/fs/fs-test.sh
@@ -400,7 +400,7 @@
# md5sum in u-boot has output of form:
# md5 for 01000008 ... 01100007 ==> <md5>
# the 7th field is the actual md5
- md5_src=`grep -A3 "$1" "$2" | grep "md5 for"`
+ md5_src=`grep -A3 "$1" "$2" | grep "md5 for" | tr -d '\r'`
md5_src=($md5_src)
md5_src=${md5_src[6]}