Merge branch 'busybox' into merge

1 files changed, 0 insertions, 11 deletions

diff --git a/TODO b/TODO
index 44364690f..d2a085ede 100644
--- a/TODO
+++ b/TODO
@@ -128,15 +128,6 @@ patch
   And while we're at it, a new patch filename quoting format is apparently
   coming soon:  http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
 ---
-stty / catv
-  stty's visible() function and catv's guts are identical. Merge them into
-  an appropriate libbb function.
----
-struct suffix_mult
-  Several duplicate users of: grep -r "1024\*1024" * -B2 -A1
-  Merge to a single size_suffixes[] in libbb.
-  Users: head tail od_bloaty hexdump and (partially as it wouldn't hurt) svlogd
----
 tail
   ./busybox tail -f foo.c~ TODO
   should not print fmt=header_fmt for subsequent date >> TODO; i.e. only
@@ -234,8 +225,6 @@ Minor stuff:
   See grep -r strtod
   Alot of duplication that wants cleanup.
 ---
-  in_ether duplicated in network/{interface,ifconfig}.c
----
   unify progress_meter. wget, flash_eraseall, pipe_progress, fbsplash, setfiles.
 ---
   support start-stop-daemon -d <chdir-path>