From owner-cvs-src@FreeBSD.ORG  Mon Jun  5 17:48:36 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CF5D816B0A2;
	Mon,  5 Jun 2006 17:48:36 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 91D0543D8F;
	Mon,  5 Jun 2006 17:48:26 +0000 (GMT) (envelope-from sam@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k55Hkfj0027234;
	Mon, 5 Jun 2006 17:46:41 GMT (envelope-from sam@repoman.freebsd.org)
Received: (from sam@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k55HkfCc027233;
	Mon, 5 Jun 2006 17:46:41 GMT (envelope-from sam)
Message-Id: <200606051746.k55HkfCc027233@repoman.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Mon, 5 Jun 2006 17:46:41 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/sys/contrib/dev/ath/freebsd ah_osdep.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jun 2006 17:48:39 -0000

sam         2006-06-05 17:46:41 UTC

  FreeBSD src repository

  Modified files:
    sys/contrib/dev/ath/freebsd ah_osdep.c 
  Log:
  resolve merge conflicts
  
  MFC after:      1 month
  
  Revision  Changes    Path
  1.6       +36 -9     src/sys/contrib/dev/ath/freebsd/ah_osdep.c