/include/uapi/misc/

it://git.distanz.ch/linux/net-next.git' title='net-next.git Git repository'/>
summaryrefslogtreecommitdiff
path: root/net/sctp
/linux/net-next.git/commit/net?h=nds-private-remove&id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>net/can/af_can.c
diff options
ModeNameSize
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-02-02 16:54:00 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-02 16:54:00 -0500
commite2160156bf2a7d5018e99a9993fbcdda0abac09b (patch)
tree1a70cb13dcfa7ade4c48d8a64d20543abebfb1dc /net/can/af_can.c
parent62e13097c46c69dbd7544ab2cd585ccf48f360a4 (diff)
parent6d04dfc8966019b8b0977b2cb942351f13d2b178 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All merge conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/can/af_can.c')
-rw-r--r--net/can/af_can.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/net/can/af_can.c b/net/can/af_can.c