diff --git a/[refs] b/[refs] index cd8a82c597aa..7b007c084357 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ebaf0c6032f525ddb0158fb59848d41899dce8cd +refs/heads/master: fd19e44f449f7e2e58d42d7bb6813e2292c38fba diff --git a/trunk/Makefile b/trunk/Makefile index cdeda68cf2aa..7e4968fb2134 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -789,7 +789,7 @@ $(vmlinux-dirs): prepare scripts pattern = ".*/localversion[^~]*" string = $(shell cat /dev/null \ - `find $(objtree) $(srctree) -maxdepth 1 -regex $(pattern) | sort`) + `find $(objtree) $(srctree) -maxdepth 1 -regex $(pattern) | sort -u`) localver = $(subst $(space),, $(string) \ $(patsubst "%",%,$(CONFIG_LOCALVERSION)))