David S. Miller df39e8ba56 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:

	drivers/net/ehea/ehea_main.c
	drivers/net/wireless/iwlwifi/Kconfig
	drivers/net/wireless/rt2x00/rt61pci.c
	net/ipv4/inet_timewait_sock.c
	net/ipv6/raw.c
	net/mac80211/ieee80211_sta.c

2008-04-14 02:30:23 -07:00

..

core.c

cfg80211 API for channels/bitrates, mac80211 and driver conversion

2008-02-29 15:19:32 -05:00

core.h

cfg80211 API for channels/bitrates, mac80211 and driver conversion

2008-02-29 15:19:32 -05:00

Kconfig

net/wireless/Kconfig: whitespace corrections

2008-01-28 14:59:55 -08:00

Makefile

cfg80211 API for channels/bitrates, mac80211 and driver conversion

2008-02-29 15:19:32 -05:00

nl80211.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2008-04-14 02:30:23 -07:00

nl80211.h

[NL80211]: add netlink interface to cfg80211

2007-10-10 16:52:14 -07:00

radiotap.c

[WIRELESS] radiotap parser: accept all other fields

2007-10-10 16:47:43 -07:00

reg.c

cfg80211: default to regulatory max power for channel

2008-04-08 16:44:41 -04:00

sysfs.c

Driver core: change add_uevent_var to use a struct

2007-10-12 14:51:01 -07:00

sysfs.h

[WIRELESS] cfg80211: New wireless config infrastructure.

2007-04-25 22:29:41 -07:00

util.c

cfg80211: don't export ieee80211_get_channel

2008-03-27 16:03:20 -04:00

wext.c

[NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS.

2008-03-26 04:39:53 +09:00