Merge busybox into merge

Fix merge conflicts in coreutils/ls.c and shell/ash.c.

Update config files to turn off SHA1_HWACCEL.  It uses non-portable
assembler.

1 files changed, 2 insertions, 0 deletions

diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index 41bf54e75..67d3c7cf7 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -46,6 +46,8 @@ lib-y += llist.o
 lib-y += make_directory.o
 lib-y += hash_md5_sha.o
 lib-y += hash_md5_sha_x86-64.o
+lib-y += hash_md5_sha_x86-64_shaNI.o
+lib-y += hash_md5_sha_x86-32_shaNI.o
 # Alternative (disabled) MD5 implementation
 #lib-y += hash_md5prime.o
 lib-y += messages.o