X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=import-akpm;h=235ab70386eb5eeb90b2e71226e10f708f5b0c63;hb=875853ce888121d04682fdaa059b1c8a121018f2;hp=ac5750446e3821314eab48108da740bab2c86709;hpb=6841fa6442e714b3e8e59420cdfe26adf060ef73;p=next-scripts

diff --git a/import-akpm b/import-akpm
index ac57504..235ab70 100755
--- a/import-akpm
+++ b/import-akpm
@@ -55,6 +55,7 @@ execute git branch tmp-akpm/current-base ||
 	$SHELL -i || exit
 
 sed_exp='
+s/\r$//
 /NEXT_PATCHES_START/,/NEXT_PATCHES_END/{
 	s/[ \t]*#.*$//
 	/^[ \t]*$/!p