Files
android_kernel_xiaomi_sm8450/security/selinux/hooks.c
Paul Moore 825e587af2 Merge tag 'v3.13' into stable-3.14
Linux 3.13

Conflicts:
	security/selinux/hooks.c

Trivial merge issue in selinux_inet_conn_request() likely due to me
including patches that I sent to the stable folks in my next tree
resulting in the patch hitting twice (I think).  Thankfully it was an
easy fix this time, but regardless, lesson learned, I will not do that
again.
2014-02-05 10:39:48 -05:00

151 KiB