]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7e410cf 8f96154)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...
authorDavid S. Miller <davem@davemloft.net>
Thu, 11 Apr 2013 20:14:37 +0000 (16:14 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 11 Apr 2013 20:14:37 +0000 (16:14 -0400)
commita2901e2ad0796c0732b8ec5a9622dd12396cddef
tree67831545a57cf08820b7f59d0e745e3b30d1a0eetree | snapshot
parent7e410cf45d9e73ee88d24fd4df83b193a9899818commit | diff
parent8f9615486fa6b3466ba2dd153ed30f0e2faa36eacommit | diff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next

Steffen Klassert says:

====================
1)  Allow to avoid copying DSCP during encapsulation
    by setting a SA flag. From Nicolas Dichtel.

2) Constify the netlink dispatch table, no need to modify it
   at runtime. From Mathias Krause.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
Linux Kernel Source Tree.