Arend van Spriel 3821b4247b wireless: remove duplicate enum ieee80211_eid definitions ... WLAN_EID_WPA and WLAN_EID_GENERIC mapped to the same value as WLAN_EID_VENDOR_SPECIFIC. The last one being more in line with the standard specification. Removing WLAN_EID_WPA and WLAN_EID_GENERIC as there are no longer drivers using these. Cc: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>		2012-10-18 09:01:55 +02:00
..
acpi	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2012-10-08 07:14:06 +09:00
asm-generic	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2012-10-14 14:39:05 -07:00
clocksource
crypto	Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux	2012-10-14 13:39:34 -07:00
drm	Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next	2012-10-07 21:13:54 +10:00
keys	KEYS: Asymmetric key pluggable data parsers	2012-10-08 13:50:13 +10:30
linux	wireless: remove duplicate enum ieee80211_eid definitions	2012-10-18 09:01:55 +02:00
math-emu
media	Merge branch 'exynos-drm-next' of git://git.infradead.org/users/kmpark/linux-samsung into drm-next	2012-10-07 21:06:33 +10:00
memory
misc
mtd	UAPI: (Scripted) Disintegrate include/mtd	2012-10-09 09:49:09 +01:00
net	mac80211: Notify new IBSS network creation	2012-10-18 09:01:53 +02:00
pcmcia
ras
rdma	infiniband: pass rdma_cm module to netlink_dump_start	2012-10-07 00:30:56 -04:00
rxrpc
scsi	SCSI misc on 20121012	2012-10-13 10:57:01 +09:00
sound	Sound updates for 3.7-rc1	2012-10-09 07:07:14 +09:00
target
trace	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2012-10-10 10:49:20 +09:00
uapi	cfg80211: add support for flushing old scan results	2012-10-18 09:01:52 +02:00
video	fbdev updates for 3.7	2012-10-12 10:21:02 +09:00
xen	UAPI Disintegration 2012-10-09	2012-10-13 11:14:29 +09:00
Kbuild