update changelogs for Debian build

diff --git a/ChangeLog b/ChangeLog
index 5fcf8d703024914ab9c09c9a1fb49218e98c5513..b65681ad1797b52f122ccb2c04a267738e6e49fc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+commit 314d27a73c903fef2968dabac3d5313573713460
+Merge: fa77db2 823fc0a
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Thu May 6 12:47:30 2010 -0600
+
+    Merge remote branch 'remotes/origin/fix-reset'
+
+commit 823fc0ac27b8df9b4ba1ca0f229b431baf5b46dd
+Author: Keith Packard <keithp@keithp.com>
+Date:   Wed May 5 12:50:39 2010 -0700
+
+    Don't change dbg clock while changing reset_n. Use 20ms everywhere
+    
+    This changes the reset code to be more conservative about changing
+    things at the same time, and also sets all timings to 20ms to make
+    debugging with the scope easier.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit fa77db2ffd8a749c93767db5a6311131e00473ae
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Wed May 5 02:34:41 2010 -0600
+
+    update changelogs for Debian build
+
 commit 8b6767e24a88482dbd3d4c4c969a0be08917d22b
 Author: Keith Packard <keithp@keithp.com>
 Date:   Wed May 5 01:32:46 2010 -0700

diff --git a/debian/changelog b/debian/changelog
index 7d9ad6702cde278de9222cb3163fd2297dd97f4f..5f037f2d2d7f6f570969a7ae62b6e98e51b14214 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+altos (0.6+193+g314d27a) unstable; urgency=low
+
+  [ Keith Packard ]
+  * Don't change dbg clock while changing reset_n. Use 20ms everywhere
+
+ -- Bdale Garbee <bdale@gag.com>  Thu, 06 May 2010 12:47:51 -0600
+
 altos (0.6+190+g8b6767e) unstable; urgency=low
 
   [ Keith Packard ]