diff options
| author | David S. Miller <davem@davemloft.net> | 2013-04-11 16:14:37 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-11 16:14:37 -0400 |
| commit | 16e3d9648add0b3839587fd77f510537baf88c3a (patch) | |
| tree | 67831545a57cf08820b7f59d0e745e3b30d1a0ee /drivers/pinctrl/sh-pfc | |
| parent | c59fec207bc73612c9a124539b99d186ad6d2a99 (diff) | |
| parent | 05600a799f6c67b139f2bc565e358b913b230cf5 (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>
Diffstat (limited to 'drivers/pinctrl/sh-pfc')
0 files changed, 0 insertions, 0 deletions