tree f0d2b3127fc48c862967d68c46c2d46668137515
parent e4077e018b5ead3de9951fc01d8bf12eeeeeefed
parent 4a1032faac94ebbf647460ae3e06fc21146eb280
author David S. Miller <davem@davemloft.net> 1271022833 -0700
committer David S. Miller <davem@davemloft.net> 1271022833 -0700

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