diff options
author | David S. Miller <davem@davemloft.net> | 2011-05-04 22:54:50 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-05-04 22:54:50 +0200 |
commit | 5a412ad7f4c95bb5b756aa12b52646e857e7c75d (patch) | |
tree | cff969a08da663077938e41bdeaa43855e00d4d9 /net/can/af_can.c | |
parent | ipv6: Use flowi4->{daddr,saddr} in ipip6_tunnel_xmit(). (diff) | |
parent | ixgbe: Cleanup PCIe bus speed info (diff) | |
download | linux-5a412ad7f4c95bb5b756aa12b52646e857e7c75d.tar.xz linux-5a412ad7f4c95bb5b756aa12b52646e857e7c75d.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6
Diffstat (limited to 'net/can/af_can.c')
0 files changed, 0 insertions, 0 deletions