| commit | 825e587af2e90e9b953849f3347a01d8f383d577 | [log] [tgz] |
|---|---|---|
| author | Paul Moore <pmoore@redhat.com> | Tue Jan 28 14:44:16 2014 -0500 |
| committer | Paul Moore <pmoore@redhat.com> | Wed Feb 05 10:39:48 2014 -0500 |
| tree | e48942a05882da47544e179c6a0c920e00137a6a | |
| parent | 8ed814602876bec9bad2649ca17f34b499357a1c [diff] | |
| parent | d8ec26d7f8287f5788a494f56e8814210f0e64be [diff] |
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.