kevin/linux
1
Fork 0
Code
b4ba26119b
linux/net/tipc
History
David S. Miller 871039f02f Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 
Conflicts:
	drivers/net/stmmac/stmmac_main.c
	drivers/net/wireless/wl12xx/wl1271_cmd.c
	drivers/net/wireless/wl12xx/wl1271_main.c
	drivers/net/wireless/wl12xx/wl1271_spi.c
	net/core/ethtool.c
	net/mac80211/scan.c
2010-04-11 14:53:53 -07:00
..
addr.c [NET] TIPC: Fix whitespace errors. 2007-02-10 23:20:15 -08:00
addr.h [TIPC]: Kill unused static inline (x5) 2008-02-07 18:17:13 -08:00
bcast.c tipc: Increase frequency of load distribution over broadcast link 2010-03-16 21:23:23 -07:00
bcast.h tipc: fix non-const printf format arguments 2009-03-18 19:11:29 -07:00
bearer.c tipc: Fix oops on send prior to entering networked mode (v3) 2010-03-04 00:53:52 -08:00
bearer.h tipc: Fix oops on send prior to entering networked mode (v3) 2010-03-04 00:53:52 -08:00
cluster.c net: Move && and || to end of previous line 2009-11-29 16:55:45 -08:00
cluster.h tipc: Don't use structure names which easily globally conflict. 2008-09-02 23:38:32 -07:00
config.c tipc: Fix initialization sequence problems when entering network mode 2008-05-21 14:55:04 -07:00
config.h [NET] TIPC: Fix whitespace errors. 2007-02-10 23:20:15 -08:00
core.c TIPC: Updated topology subscription protocol according to latest spec 2010-04-06 19:50:19 -07:00
core.h include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
dbg.c tipc: fix non-const printf format arguments 2009-03-18 19:11:29 -07:00
dbg.h tipc: Elimination of print buffer chaining 2008-05-05 01:22:30 -07:00
discover.c tipc: Don't use structure names which easily globally conflict. 2008-09-02 23:38:32 -07:00
discover.h tipc: Minor optimizations to received message processing 2008-06-04 17:32:35 -07:00
eth_media.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
handler.c mm: Remove slab destructors from kmem_cache_create(). 2007-07-20 10:11:58 +09:00
Kconfig tipc: Clean up configuration file 2010-01-19 14:23:57 -08:00
link.c tipc: remove trailing space in messages 2010-03-24 14:01:54 -07:00
link.h tipc: Don't use structure names which easily globally conflict. 2008-09-02 23:38:32 -07:00
Makefile
msg.c tipc: Fix bugs in message error code display when debugging 2008-06-04 17:29:09 -07:00
msg.h tipc: Message rejection rework preparatory changes 2008-06-04 17:54:48 -07:00
name_distr.c tipc: Optimize message initialization routine 2008-06-04 17:37:34 -07:00
name_distr.h [NET] TIPC: Fix whitespace errors. 2007-02-10 23:20:15 -08:00
name_table.c tipc: trivial endian annotation in debug statement 2008-11-07 23:37:50 -08: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: define needless global scoped variable static 2010-03-30 23:58:22 -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_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
node.c tipc: remove trailing space in messages 2010-03-24 14:01:54 -07:00
node.h tipc: Don't use structure names which easily globally conflict. 2008-09-02 23:38:32 -07:00
port.c tipc: Eliminate improper use of TIPC_OK error code 2008-07-14 22:44:01 -07:00
port.h tipc: Don't use structure names which easily globally conflict. 2008-09-02 23:38:32 -07:00
ref.c tipc: fix lockdep warning on address assignment 2010-03-16 14:15:45 -07:00
ref.h [TIPC]: Remove inlining of reference table locking routines 2008-04-16 18:21:16 -07:00
socket.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
subscr.c TIPC: Updated topology subscription protocol according to latest spec 2010-04-06 19:50:19 -07:00
subscr.h tipc: fix endianness on tipc subscriber messages 2010-03-08 12:20:58 -08: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: Don't use structure names which easily globally conflict. 2008-09-02 23:38:32 -07:00
zone.h tipc: Don't use structure names which easily globally conflict. 2008-09-02 23:38:32 -07:00