summaryrefslogtreecommitdiffstats
path: root/net/can
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-11-29 09:57:15 +0100
committerDavid S. Miller <davem@davemloft.net>2009-11-29 09:57:15 +0100
commit9b963e5d0e01461099a40117b05480f24b63381f (patch)
tree4756d554e37bf4ab7202f2c564cbe629af98b576 /net/can
parentixgbe: Display currently attached PHY through ethtool (diff)
parentsctp: on T3_RTX retransmit all the in-flight chunks (diff)
downloadlinux-9b963e5d0e01461099a40117b05480f24b63381f.tar.xz
linux-9b963e5d0e01461099a40117b05480f24b63381f.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/ieee802154/fakehard.c drivers/net/e1000e/ich8lan.c drivers/net/e1000e/phy.c drivers/net/netxen/netxen_nic_init.c drivers/net/wireless/ath/ath9k/main.c
Diffstat (limited to 'net/can')
0 files changed, 0 insertions, 0 deletions