Origin Code
Merge branch 'master' of github.com:kzhong1991/pramfs

Conflicts:
	pramfs-1.5.0-3.11/pramfs-1.5.0-3.11/file.c

 Changes to be committed:

	deleted:    aaaaa
	modified:   balloc.c
	modified:   file.c
Merge branch 'master' of github.com:kzhong1991/pramfs