OpenCloudOS-Kernel/net/tipc
David S. Miller 2198a10b50 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	net/core/dev.c
2010-10-21 08:43:05 -07:00
..
Kconfig tipc: Clean up configuration file 2010-01-19 14:23:57 -08:00
Makefile [TIPC] Initial merge 2006-01-12 14:06:31 -08:00
addr.c tipc: cleanup function namespace 2010-10-16 11:13:24 -07:00
addr.h tipc: Reduce footprint by un-inlining address routines 2010-05-12 23:02:26 -07:00
bcast.c tipc: cleanup function namespace 2010-10-16 11:13:24 -07:00
bcast.h tipc: cleanup function namespace 2010-10-16 11:13:24 -07:00
bearer.c tipc: delete needless memset from bearer enabling. 2010-10-21 04:25:51 -07:00
bearer.h tipc: Reduce footprint by un-inlining bearer congestion routine 2010-05-12 23:02:28 -07:00
cluster.c tipc: cleanup function namespace 2010-10-16 11:13:24 -07:00
cluster.h tipc: cleanup function namespace 2010-10-16 11:13:24 -07:00
config.c tipc: cleanup function namespace 2010-10-16 11:13:24 -07:00
config.h tipc: cleanup function namespace 2010-10-16 11:13:24 -07:00
core.c tipc: Kill tipc_get_mode() completely. 2010-10-18 01:06:20 -07:00
core.h tipc: cleanup function namespace 2010-10-16 11:13:24 -07:00
dbg.c tipc: cleanup function namespace 2010-10-16 11:13:24 -07:00
dbg.h tipc: cleanup function namespace 2010-10-16 11:13:24 -07:00
discover.c tipc: cleanup function namespace 2010-10-16 11:13:24 -07:00
discover.h tipc: cleanup function namespace 2010-10-16 11:13:24 -07:00
eth_media.c tipc: Optimize handling excess content on incoming messages 2010-09-09 21:34:14 -07:00
handler.c mm: Remove slab destructors from kmem_cache_create(). 2007-07-20 10:11:58 +09:00
link.c tipc: cleanup function namespace 2010-10-16 11:13:24 -07:00
link.h tipc: cleanup function namespace 2010-10-16 11:13:24 -07:00
msg.c tipc: cleanup function namespace 2010-10-16 11:13:24 -07:00
msg.h net: return operator cleanup 2010-09-23 14:33:39 -07:00
name_distr.c tipc: cleanup function namespace 2010-10-16 11:13:24 -07:00
name_distr.h [NET] TIPC: Fix whitespace errors. 2007-02-10 23:20:15 -08:00
name_table.c tipc: clean out all instances of #if 0'd unused code 2010-10-13 14:27:34 -07:00
name_table.h tipc: Don't use structure names which easily globally conflict. 2008-09-02 23:38:32 -07:00
net.c tipc: clean out all instances of #if 0'd unused code 2010-10-13 14:27:34 -07:00
net.h tipc: Don't use structure names which easily globally conflict. 2008-09-02 23:38:32 -07:00
netlink.c genetlink: make netns aware 2009-07-12 14:03:27 -07:00
node.c tipc: cleanup function namespace 2010-10-16 11:13:24 -07:00
node.h tipc: cleanup function namespace 2010-10-16 11:13:24 -07:00
node_subscr.c tipc: Don't use structure names which easily globally conflict. 2008-09-02 23:38:32 -07:00
node_subscr.h tipc: Don't use structure names which easily globally conflict. 2008-09-02 23:38:32 -07:00
port.c tipc: cleanup function namespace 2010-10-16 11:13:24 -07:00
port.h tipc: cleanup function namespace 2010-10-16 11:13:24 -07:00
ref.c tipc: cleanup function namespace 2010-10-16 11:13:24 -07:00
ref.h tipc: cleanup function namespace 2010-10-16 11:13:24 -07:00
socket.c net: return operator cleanup 2010-09-23 14:33:39 -07:00
subscr.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-10-21 08:43:05 -07:00
subscr.h Revert d88dca79d3 2010-10-21 04:11:08 -07:00
user_reg.c tipc: Eliminate improper use of TIPC_OK error code 2008-07-14 22:44:01 -07:00
user_reg.h [NET] TIPC: Fix whitespace errors. 2007-02-10 23:20:15 -08:00
zone.c tipc: cleanup function namespace 2010-10-16 11:13:24 -07:00
zone.h tipc: cleanup function namespace 2010-10-16 11:13:24 -07:00