[PATCH] wireless: Add softmac layer to the kernel

Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --cc include/net/ieee80211softmac.h
Simple merge

diff --cc include/net/ieee80211softmac_wx.h
Simple merge

diff --cc net/ieee80211/Kconfig
Simple merge

diff --cc net/ieee80211/softmac/Kconfig
Simple merge

diff --cc net/ieee80211/softmac/Makefile
Simple merge

diff --cc net/ieee80211/softmac/ieee80211softmac_assoc.c
Simple merge

diff --cc net/ieee80211/softmac/ieee80211softmac_auth.c
Simple merge

diff --cc net/ieee80211/softmac/ieee80211softmac_event.c
Simple merge

diff --cc net/ieee80211/softmac/ieee80211softmac_io.c
Simple merge

diff --cc net/ieee80211/softmac/ieee80211softmac_module.c
Simple merge

diff --cc net/ieee80211/softmac/ieee80211softmac_priv.h
Simple merge

diff --cc net/ieee80211/softmac/ieee80211softmac_scan.c
Simple merge

diff --cc net/ieee80211/softmac/ieee80211softmac_wx.c
Simple merge