diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-23 18:41:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-23 18:41:51 -0800 |
| commit | 94f5a00d7c37ef8a3f85f8ea29903d4bf2291664 (patch) | |
| tree | c25b765601b7b96049736bee8cb4b4da9e751d52 /net/core/net_namespace.c | |
| parent | eab99d9b97d136ddfd66af66e0536a58195b3040 (diff) | |
| parent | b334349eb4c8562fd60bc8a8bd5ba6b42f22b8ac (diff) | |
| download | linux-94f5a00d7c37ef8a3f85f8ea29903d4bf2291664.tar.gz linux-94f5a00d7c37ef8a3f85f8ea29903d4bf2291664.tar.bz2 linux-94f5a00d7c37ef8a3f85f8ea29903d4bf2291664.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
sis190: scheduling while atomic error
sis190: mdio operation failure is not correctly detected
sis190: remove duplicate INIT_WORK
sis190: add cmos ram access code for the SiS19x/968 chipset pair
[INET]: Fix truesize setting in ip_append_data
[NETNS]: Re-export init_net via EXPORT_SYMBOL.
iwlwifi: fix possible read attempt on ucode that is not available
[IPV4]: Add missing skb->truesize increment in ip_append_page().
[TULIP] DMFE: Fix SROM parsing regression.
[BLUETOOTH]: Move children of connection device to NULL before connection down.
Diffstat (limited to 'net/core/net_namespace.c')
| -rw-r--r-- | net/core/net_namespace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index 383252b50411..ec936ae92458 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c @@ -18,7 +18,7 @@ static DEFINE_MUTEX(net_mutex); LIST_HEAD(net_namespace_list); struct net init_net; -EXPORT_SYMBOL_GPL(init_net); +EXPORT_SYMBOL(init_net); /* * setup_net runs the initializers for the network namespace object. |