aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can/vcan.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2018-01-29 10:14:59 -0500
committerDavid S. Miller <davem@davemloft.net>2018-01-29 10:15:51 -0500
commit3e3ab9ccca5b50b11bd4d16c2048b667343354bd (patch)
tree7279f7401e7cc2b93fb7cb2bff894b5385429a68 /drivers/net/can/vcan.c
parentMerge tag 'wireless-drivers-next-for-davem-2018-01-26' of git://git.kernel.or... (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
downloadlinux-3e3ab9ccca5b50b11bd4d16c2048b667343354bd.tar.gz
linux-3e3ab9ccca5b50b11bd4d16c2048b667343354bd.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/vcan.c')
0 files changed, 0 insertions, 0 deletions
1-1/+2 2011-05-04Git 1.7.5.1v1.7.5.1Junio C Hamano3-2/+36 2011-05-04git-add.txt: document 'add.ignoreErrors'Valentin Haenel1-0/+2 2011-05-01Pass empty file to p4merge where no base is suitable.Ciaran Jessup1-6/+3 2011-05-01Look for password in both CVS and CVSNT password files.Guy Rouillier1-12/+41 2011-04-29merge-one-file: fix broken merges with alternate work treesJeff King2-3/+8