From owner-cvs-src@FreeBSD.ORG  Fri Apr  4 01:03:24 2008
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C3AC61065672;
	Fri,  4 Apr 2008 01:03:24 +0000 (UTC)
	(envelope-from jeff@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 88B528FC0C;
	Fri,  4 Apr 2008 01:03:24 +0000 (UTC)
	(envelope-from jeff@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3413Oj3074117;
	Fri, 4 Apr 2008 01:03:24 GMT (envelope-from jeff@repoman.freebsd.org)
Received: (from jeff@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3413ODX074116;
	Fri, 4 Apr 2008 01:03:24 GMT (envelope-from jeff)
Message-Id: <200804040103.m3413ODX074116@repoman.freebsd.org>
From: Jeff Roberson <jeff@FreeBSD.org>
Date: Fri, 4 Apr 2008 01:03:23 +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/kern kern_intr.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: Fri, 04 Apr 2008 01:03:24 -0000

jeff        2008-04-04 01:03:23 UTC

  FreeBSD src repository

  Modified files:
    sys/kern             kern_intr.c 
  Log:
   - Fix a mis-merge that crept in during the softclock changes.
  
  Spotted by:     jhb
  
  Revision  Changes    Path
  1.159     +0 -2      src/sys/kern/kern_intr.c