From owner-cvs-src-old@FreeBSD.ORG Thu Dec 18 04:58:30 2008 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 35304106574E for ; Thu, 18 Dec 2008 04:58:30 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 298268FC14 for ; Thu, 18 Dec 2008 04:58:30 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBI4wU8p045941 for ; Thu, 18 Dec 2008 04:58:30 GMT (envelope-from sbruno@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBI4wTY6045940 for cvs-src-old@freebsd.org; Thu, 18 Dec 2008 04:58:29 GMT (envelope-from sbruno@repoman.freebsd.org) Message-Id: <200812180458.mBI4wTY6045940@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to sbruno@repoman.freebsd.org using -f From: Sean Bruno Date: Thu, 18 Dec 2008 04:58:22 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: RELENG_6 Subject: cvs commit: src/usr.sbin/fwcontrol fwcontrol.8 fwcontrol.c fwmpegts.c X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Dec 2008 04:58:30 -0000 sbruno 2008-12-18 04:58:22 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) usr.sbin/fwcontrol fwcontrol.8 fwcontrol.c fwmpegts.c Log: SVN rev 186267 on 2008-12-18 04:58:22Z by sbruno Approved by: slong (scottl@samsco.org) Merge and fixups from -current to cleanup fwcontrol handling and reporting. The following changesets were already merged. I have noted the corresponding changeset where the merge by hand occured. 165628 --> 165820 170878 --> 170959 173195 --> 173328 176810 --> 178718 These two changes were not propagated back to stable/6 and are cosmetic. 173196 white space 173214 dup .Pp sort SEE ALSO The following checkins implement: 182911 fixups for fwcontrol for multiple firewire boards add commandline ability to parse multiple arguments 182048 man page cleanups and usage() display updates 185996 add NetBSD compatibility in compile Revision Changes Path 1.16.2.4 +36 -24 src/usr.sbin/fwcontrol/fwcontrol.8 1.22.2.3 +418 -124 src/usr.sbin/fwcontrol/fwcontrol.c 1.1.2.2 +8 -0 src/usr.sbin/fwcontrol/fwmpegts.c