head	1.2;
access;
symbols
	rel-8-1-2-sv:1.2
	rel-6-2-2-sv:1.1.1.1
	rel-6-2-1-sv:1.1.1.1
	import-20060615:1.1.1.1
	import-20060530:1.1.1.1
	import-20060516:1.1.1.1
	import-20060421:1.1.1.1
	import-20060406:1.1.1.1
	import-29mar06:1.1.1.1
	import-14mar06:1.1.1.1
	import-13mar06:1.1.1.1
	fixed-post-import-14feb06:1.1.1.1
	import-14feb06:1.1.1.1
	fixed-post-import-6feb06:1.1.1.1
	import-6feb06:1.1.1.1
	freescale:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2006.11.27.11.42.55;	author seh;	state dead;
branches;
next	1.1;

1.1
date	2006.02.06.14.20.01;	author seh;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2006.02.06.14.20.01;	author seh;	state Exp;
branches;
next	;


desc
@@


1.2
log
@fix conflicts from fsl import-20061124
@
text
@#
# /etc/fstab: static file system information.
#
# file system   mount       type    options           dump    pass
#/dev/root       /           ext2    rw,noauto         0       1
proc            /proc       proc    defaults          0       0
# The following 2 lines are items that are not enabled in the 
# default kernel configuration.  If you enable these items in
# the future, change ltib/config/platform/m520xevb/merge/etc/fstab.
#devpts          /dev/pts    devpts  gid=5,mode=620    0       0
#tmpfs           /dev/shm    tmpfs   defaults          0       0
sysfs           /sys        sysfs   defaults          0       0

/dev/fd0        /mnt/floppy auto    noauto,owner      0       0
/dev/cdrom      /mnt/cdrom  iso9660 noauto,owner,ro   0       0

## other examples, uncomment to activate
#/dev/hda2      /opt        ext2    defaults          1       2
#/dev/hda3      swap        swap    defaults          0       0

@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@Import from fsl 6feb06
@
text
@@
