From: Mike Westerhof <mwester@dls.net>
Date: Fri, 26 May 2006 03:58:41 +0000 (+0000)
Subject: merge of 8ac4847056fba1c5b2b9ba03a8b6cb16c799aa19
X-Git-Tag: Release-2010-05/1~9453^2~1617^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bdd82295819fdd8eda7a2a2dfa0f75b92eb1f40;p=openembedded.git

merge of 8ac4847056fba1c5b2b9ba03a8b6cb16c799aa19
     and b3548a7dc6d9be0b03545b677be4cdd71cbbb2a9
---

1bdd82295819fdd8eda7a2a2dfa0f75b92eb1f40
diff --cc packages/nslu2-binary-only/unslung-rootfs/NOTES
index 17def07ed8,f4a7bf724b..3ff7d79d43
--- a/packages/nslu2-binary-only/unslung-rootfs/NOTES
+++ b/packages/nslu2-binary-only/unslung-rootfs/NOTES
@@@ -524,7 -524,7 +524,6 @@@ Fix extraneous boot messages from jffs
  used when building the flash jffs image).
  
  Added pl2303.c patch for TIOCMGET/MSET/MBIS/MBIC.
--
  Syntax fixes in prep for newer busybox:
   - comments in rc.samba, "cp" in rc.sysinit