[linuxdc-cvs] CVS: linux-sh-dc ChangeLog.dc,1.56.2.2,1.56.2.3

[M. R. B. <mr...@us...>]

Update of /cvsroot/linuxdc/linux-sh-dc
In directory usw-pr-cvs1:/tmp/cvs-serv20342

Modified Files:
      Tag: linux-sh-dc-2_4-branch
	ChangeLog.dc 
Log Message:
Fix merge breakage

Index: ChangeLog.dc
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/ChangeLog.dc,v
retrieving revision 1.56.2.2
retrieving revision 1.56.2.3
diff -u -d -r1.56.2.2 -r1.56.2.3
--- ChangeLog.dc	26 Oct 2002 14:14:00 -0000	1.56.2.2
+++ ChangeLog.dc	26 Oct 2002 14:18:26 -0000	1.56.2.3
@@ -1,5 +1,8 @@
 2002-10-26  M. R. Brown  <mr...@li...>
 
+	* Documentation/Configure.help, drivers/sound/Config.in: Fix merge
+	breakage.
+
 	Linux-SH 2.4.20-pre11
 
 	* AGAINST-2.4.20-pre11: New file.