projects / platform / kernel / linux-amlogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c59fec2 05600a7)
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)
commit16e3d9648add0b3839587fd77f510537baf88c3a
tree67831545a57cf08820b7f59d0e745e3b30d1a0eetree | snapshot
parentc59fec207bc73612c9a124539b99d186ad6d2a99commit | diff
parent05600a799f6c67b139f2bc565e358b913b230cf5commit | diff
Merge branch 'master' of git://git./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>
Domain: System / Kernel;