]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e89d59d 6f90107)
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)
commitbc8b910dd74288e772ed55e7d40296cbcc94f378
treee48942a05882da47544e179c6a0c920e00137a6atree | snapshot
parente89d59db33343ca6e85b36f2277c35c17f5ac74dcommit | diff
parent6f901070d1e82d660134da81830d2ae10463f655commit | 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.