]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commit
Merge branch 'master' of rtime.felk.cvut.cz:can-eth-gw-linux
authorMichal Sojka <sojkam1@fel.cvut.cz>
Fri, 4 Apr 2014 14:37:20 +0000 (16:37 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Fri, 4 Apr 2014 14:37:20 +0000 (16:37 +0200)
commit6617e487023de8582afcf1cf51b532a8e1260902
tree7d55b55741099bb32479da45fb7b1d194c25a188
parentdaa61222602b864ea80e4fb1e7e428136b392c6d
parent8ef9678d30f06438daf10a353b24a1c38a284a1b
Merge branch 'master' of rtime.felk.cvut.cz:can-eth-gw-linux

Conflicts:
include/uapi/linux/can/canethgw.h
net/can/canethgw.c
include/uapi/linux/can/canethgw.h
net/can/canethgw.c