You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		17 years ago
..
Kconfig	net/wireless/Kconfig: whitespace corrections	17 years ago
Makefile	cfg80211 API for channels/bitrates, mac80211 and driver conversion	17 years ago
core.c	cfg80211 API for channels/bitrates, mac80211 and driver conversion	17 years ago
core.h	cfg80211 API for channels/bitrates, mac80211 and driver conversion	17 years ago
nl80211.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	17 years ago
nl80211.h	[NL80211]: add netlink interface to cfg80211	18 years ago
radiotap.c	[WIRELESS] radiotap parser: accept all other fields	18 years ago
reg.c	cfg80211: default to regulatory max power for channel	17 years ago
sysfs.c	Driver core: change add_uevent_var to use a struct	18 years ago
sysfs.h	…
util.c	cfg80211: don't export ieee80211_get_channel	17 years ago
wext.c	[NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS.	17 years ago