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
..
2009-04-03 14:53:16 -07:00
2009-04-03 14:53:16 -07:00
2009-04-03 14:53:16 -07:00

TODO:
	- sparse cleanups
	- checkpatch cleanups
	- kerneldoc cleanups
	- remove typedefs
	- remove unused ioctls
	- use cfg80211 for regulatory stuff
	- fix 4k stack problems

Please send patches to Greg Kroah-Hartman <greg@kroah.com> and
Pavel Machek <pavel@suse.cz>