]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ed4958b b26682c)
Merge tag 'v3.13' into stable-3.14
authorPaul Moore <pmoore@redhat.com>
Tue, 28 Jan 2014 19:44:16 +0000 (14:44 -0500)
committerPaul Moore <pmoore@redhat.com>
Wed, 5 Feb 2014 15:39:48 +0000 (10:39 -0500)
commit57017a8a2fad93e7b98da1a89da28446d211e27e
treee48942a05882da47544e179c6a0c920e00137a6atree | snapshot
parented4958baed6210ca47472ac72bd1f0ca00fa3da5commit | diff
parentb26682cb6c70c90d0654bb05b207deca145f5ab9commit | 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.
security/selinux/hooks.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.