aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-05-12 15:39:32 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-12 15:39:32 -0700
commit18552b8f227bddf569dade5c69798a37839ea913 (patch)
tree2538b43849d9ba6da32e1a309907c9ad488a939c /fs
parentfaa88df860fdfad13afc99fc7201432f9263b3b5 (diff)
parentbd89efc532fe41f867f848144cc8b42054ddf6f9 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [NEIGH]: Fix IP-over-ATM and ARP interaction. [TG3]: ethtool always report port is TP.
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions