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

…

addr.h

…

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

…

config.c

…

config.h

…

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

…

discover.c

…

discover.h

…

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

…

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

…

Makefile

…

msg.c

…

msg.h

…

name_distr.c

…

name_distr.h

…

name_table.c

…

name_table.h

…

net.c

tipc: define needless global scoped variable static

2010-03-30 23:58:22 -07:00

net.h

…

netlink.c

genetlink: make netns aware

2009-07-12 14:03:27 -07:00

node_subscr.c

…

node_subscr.h

…

node.c

tipc: remove trailing space in messages

2010-03-24 14:01:54 -07:00

node.h

…

port.c

…

port.h

…

ref.c

tipc: fix lockdep warning on address assignment

2010-03-16 14:15:45 -07:00

ref.h

…

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

…

user_reg.h

…

zone.c

…

zone.h

…