CVS: linux-atm/src .cvsignore,1.1,1.2 Makefile.am,1.2,1.3

[chas w. <ch...@us...>]

Update of /cvsroot/linux-atm/linux-atm/src
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24942/src

Modified Files:
	Makefile.am 
Added Files:
	.cvsignore 
Log Message:
merge 2.5.0 branch into the head



Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	9 Oct 2001 22:33:06 -0000	1.2
--- Makefile.am	1 Jan 2008 00:14:49 -0000	1.3
***************
*** 1,3 ****
  SUBDIRS = include lib test debug qgen saal sigd maint arpd ilmid man led lane \
! 		mpoad switch config extra
  
--- 1,3 ----
  SUBDIRS = include lib test debug qgen saal sigd maint arpd ilmid man led lane \
! 		mpoad oamd switch config extra br2684