forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse source 
Conflicts:
	drivers/net/tokenring/tmspci.c
	drivers/net/ucc_geth_mii.c
This commit is contained in:
David S. Miller 2009-03-05 02:06:47 -08:00
commit 508827ff0a
120 changed files with 1047 additions and 540 deletions
Download patch file Download diff file Expand all files Collapse all files

2
net/802/tr.c
View file

@ -670,3 +670,5 @@ module_init(rif_init);
EXPORT_SYMBOL(tr_type_trans);
EXPORT_SYMBOL(alloc_trdev);
MODULE_LICENSE("GPL");