summaryrefslogtreecommitdiffstats
path: root/net/802
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-03-05 02:06:47 -0800
committerDavid S. Miller <davem@davemloft.net>2009-03-05 02:06:47 -0800
commit508827ff0ac3981d420edac64a70de7f4e304d38 (patch)
treeb0cee8ddef9f0ceab68c388e4ae46b7295eb2cb5 /net/802
parent2c3c3d02f28801d7ad2da4952b2c7ca6621ef221 (diff)
parent72e2240f181871675d3a979766330c91d48a1673 (diff)
downloadop-kernel-dev-508827ff0ac3981d420edac64a70de7f4e304d38.zip
op-kernel-dev-508827ff0ac3981d420edac64a70de7f4e304d38.tar.gz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/tokenring/tmspci.c drivers/net/ucc_geth_mii.c
Diffstat (limited to 'net/802')
-rw-r--r--net/802/tr.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/802/tr.c b/net/802/tr.c
index dab6334..e7eb130 100644
--- a/net/802/tr.c
+++ b/net/802/tr.c
@@ -670,3 +670,5 @@ module_init(rif_init);
EXPORT_SYMBOL(tr_type_trans);
EXPORT_SYMBOL(alloc_trdev);
+
+MODULE_LICENSE("GPL");
OpenPOWER on IntegriCloud