A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 01:33:00 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into next

Browse source 
Conflicts:
	fs/exec.c

Removed IMA changes (the IMA checks are now performed via may_open()).

Signed-off-by: James Morris <[email protected]>
This commit is contained in:
James Morris 2009-05-22 18:40:59 +10:00
commit 2c9e703c61
537 changed files with 8687 additions and 5816 deletions
Download patch file Download diff file Expand all files Collapse all files

3
fs/proc/root.c
View file

@ -67,8 +67,7 @@ static int proc_get_sb(struct file_system_type *fs_type,
sb->s_flags = flags;
err = proc_fill_super(sb);
if (err) {
up_write(&sb->s_umount);
deactivate_super(sb);
deactivate_locked_super(sb);
return err;
}