David S. Miller 63fe46da9c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/wireless/iwlwifi/iwl-4965-rs.c drivers/net/wireless/rt2x00/rt61pci.c		2008-05-15 00:34:44 -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	[NET] TIPC: Fix whitespace errors.	2007-02-10 23:20:15 -08:00
bcast.h	[TIPC]: Kill unused static inline (x5)	2008-02-07 18:17:13 -08:00
bearer.c	[NET] TIPC: Fix whitespace errors.	2007-02-10 23:20:15 -08:00
bearer.h	[NET] TIPC: Fix whitespace errors.	2007-02-10 23:20:15 -08:00
cluster.c	tipc: fix integer as NULL pointer sparse warnings in tipc	2008-02-24 18:38:31 -08:00
cluster.h	[NET] TIPC: Fix whitespace errors.	2007-02-10 23:20:15 -08:00
config.c	tipc: Simplify log buffer resizing	2008-05-05 01:20:04 -07:00
config.h	[NET] TIPC: Fix whitespace errors.	2007-02-10 23:20:15 -08:00
core.c	tipc: Update version number to TIPC 1.6.4	2008-05-05 01:24:36 -07:00
core.h	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2008-05-15 00:34:44 -07:00
dbg.c	tipc: Exclude debug-only print buffer code when not debugging	2008-05-05 01:24:06 -07:00
dbg.h	tipc: Elimination of print buffer chaining	2008-05-05 01:22:30 -07:00
discover.c	[NET] TIPC: Fix whitespace errors.	2007-02-10 23:20:15 -08:00
discover.h	[NET] TIPC: Fix whitespace errors.	2007-02-10 23:20:15 -08:00
eth_media.c	[NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS.	2008-03-26 04:39:53 +09:00
handler.c	mm: Remove slab destructors from kmem_cache_create().	2007-07-20 10:11:58 +09:00
Kconfig	[TIPC]: Use menuconfig objects.	2007-05-24 16:36:50 -07:00
link.c	tipc: Exclude debug-only print buffer code when not debugging	2008-05-05 01:24:06 -07:00
link.h	[NET] TIPC: Fix whitespace errors.	2007-02-10 23:20:15 -08:00
Makefile	[TIPC] Initial merge	2006-01-12 14:06:31 -08:00
msg.c	tipc: Exclude debug-only print buffer code when not debugging	2008-05-05 01:24:06 -07:00
msg.h	tipc: endianness annotations	2008-04-27 14:26:49 -07:00
name_distr.c	tipc: Fix null pointer dereference in debug code	2008-05-05 01:21:54 -07:00
name_distr.h	[NET] TIPC: Fix whitespace errors.	2007-02-10 23:20:15 -08:00
name_table.c	tipc: Enhancements to name table initialization	2008-05-12 15:41:53 -07:00
name_table.h	[NET] TIPC: Fix whitespace errors.	2007-02-10 23:20:15 -08:00
net.c	[NET] TIPC: Fix whitespace errors.	2007-02-10 23:20:15 -08:00
net.h	[NET] TIPC: Fix whitespace errors.	2007-02-10 23:20:15 -08:00
netlink.c	[TIPC]: Fix infinite loop in netlink handler	2007-06-23 22:59:40 -07:00
node_subscr.c	[NET] TIPC: Fix whitespace errors.	2007-02-10 23:20:15 -08:00
node_subscr.h	[NET] TIPC: Fix whitespace errors.	2007-02-10 23:20:15 -08:00
node.c	[TIPC]: Fix two minor sparse warnings.	2007-08-02 19:42:31 -07:00
node.h	[NET] TIPC: Fix whitespace errors.	2007-02-10 23:20:15 -08:00
port.c	tipc: Fix race condition when creating socket or native port	2008-05-12 15:42:28 -07:00
port.h	[TIPC]: Optimize stream send routine to avoid fragmentation	2007-07-10 22:06:12 -07:00
ref.c	tipc: Fix race condition when creating socket or native port	2008-05-12 15:42:28 -07:00
ref.h	[TIPC]: Remove inlining of reference table locking routines	2008-04-16 18:21:16 -07:00
socket.c	tipc: Fix race condition when creating socket or native port	2008-05-12 15:42:28 -07:00
subscr.c	tipc: Fix race condition when creating socket or native port	2008-05-12 15:42:28 -07:00
subscr.h	[NET] TIPC: Fix whitespace errors.	2007-02-10 23:20:15 -08:00
user_reg.c	[NET] TIPC: Fix whitespace errors.	2007-02-10 23:20:15 -08:00
user_reg.h	[NET] TIPC: Fix whitespace errors.	2007-02-10 23:20:15 -08:00
zone.c	tipc: fix integer as NULL pointer sparse warnings in tipc	2008-02-24 18:38:31 -08:00
zone.h	[NET] TIPC: Fix whitespace errors.	2007-02-10 23:20:15 -08:00