projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8ed8146 d8ec26d)
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)
commit825e587af2e90e9b953849f3347a01d8f383d577
treee48942a05882da47544e179c6a0c920e00137a6atree | snapshot
parent8ed814602876bec9bad2649ca17f34b499357a1ccommit | diff
parentd8ec26d7f8287f5788a494f56e8814210f0e64becommit | 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
John Crispins staging tree