summaryrefslogtreecommitdiff
path: root/proto_ip_authentication_hdr.c
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-06-15 19:40:44 +0200
committerDaniel Borkmann <dborkman@redhat.com>2013-06-15 19:40:44 +0200
commitf03b8d19313323bf66c48cb9c75c0394705686b6 (patch)
tree4a1ab87e2a264aaf2989deee0c2e4bf0a9152894 /proto_ip_authentication_hdr.c
parentf5e80759f23c602ddfca9af906f082499d49cb36 (diff)
curve: minor: fix up formatting
Just some minor whitespacing arrangements. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'proto_ip_authentication_hdr.c')
0 files changed, 0 insertions, 0 deletions
8f218e4c9276b0bac0545e5184c1c47b&id2=926af6273fc683cd98cd0ce7bf0d04a02eed6742'>diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q/vlan_mvrp.c')