[src/netbsd-6]: src/doc Ticket 823. While here, make sure there's only one e...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3c415477c2a9
branches:  netbsd-6
changeset: 775703:3c415477c2a9
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Feb 18 17:59:33 2013 +0000

description:
Ticket 823.  While here, make sure there's only one entry for ticket 813.

diffstat:

 doc/CHANGES-6.1 |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (22 lines):

diff -r 6fbfce6724b2 -r 3c415477c2a9 doc/CHANGES-6.1
--- a/doc/CHANGES-6.1   Mon Feb 18 17:57:57 2013 +0000
+++ b/doc/CHANGES-6.1   Mon Feb 18 17:59:33 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.1,v 1.1.2.99 2013/02/18 17:54:41 riz Exp $
+# $NetBSD: CHANGES-6.1,v 1.1.2.100 2013/02/18 17:59:33 riz Exp $
 
 A complete list of changes from the 6.0 release until the 6.1 release:
 
@@ -8505,6 +8505,9 @@
        not set SS_NBIO.
        [christos, ticket #822]
 
-sys/dev/usb/dwc_otg.c                          patch
-       Fix a locking error in the last commit
-       [skrll, ticket #813]
+sys/dev/pci/if_wm.c                            1.235-1.236 via patch
+
+       Fix a problem that if_wm.c can't compile with WM_DEBUG on
+       non-64bit platforms.
+       [msaitoh, ticket #823]
+