Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f74d4093 authored by threader's avatar threader Committed by Bernhard Thoben
Browse files

ANDROID: binderfs: Clean up after git pick conflict

parent 70fe8582

drivers/android/binderfs.c

+0 −1
Original line number Diff line number Diff line
@@ -731,7 +731,6 @@ static int binderfs_fill_super(struct super_block *sb, void *data, int silent) 
		return init_binder_logs(sb);



	return 0;

>>>>>>> 0e13e452dafc (binder: Add stats, state and transactions files)

}



static struct dentry *binderfs_mount(struct file_system_type *fs_type,