Merge branch 'for-next/fs'
Conflicts:
	fs/Kconfig
	fs/Makefile
commit bf8988d820f2e8dd936405920c7f27fcb3135415
2 parents 574947e + 12158a2
@Sascha Hauer Sascha Hauer authored on 7 Oct 2013
Showing 4 changed files
View
fs/Kconfig
View
fs/Makefile
View
fs/uimagefs.c 0 → 100644
View
include/uimagefs.h 0 → 100644