From 6d03c944639297dc964cbd06180702a6934a45bc Mon Sep 17 00:00:00 2001
From: Jennifer Averett <Jennifer.Averett@OARcorp.com>
Date: Tue, 17 May 2005 14:53:01 +0000
Subject: 2005-05-17	Jennifer Averett <jennifer.averett@oarcorp.com>

	* Makefile.am, preinstall.am: Added a common irq.h
	* include/rtems/irq.h: New file.
---
 cpukit/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

(limited to 'cpukit')

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 3bc950c2e0..e95e633f16 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -34,7 +34,6 @@
 	* libnetworking/net/rtsock.c: Abandon AF_NS.
 	* libnetworking/sys/socket.h: Abandon AF_NS, PF_NS.
 
->>>>>>> 1.520
 2005-05-10	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* httpd/socket.c: socklen_t.
-- 
cgit v1.2.3