Revert "Fix merge(to keep source clean)"

This reverts commit d7eb19a96da121c68fcc69641de27f9ac91b419d.
Revert "Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6"

This reverts commit 7f1786981060af9448450273b7028976392b2edf.

Conflicts:
	net/mac80211/driver-ops.h
	net/mac80211/iface.c
	net/mac80211/pm.c
	net/mac80211/util.c
Revert "mac80211: remove struct ieee80211_if_init_conf"

This reverts commit 078ffc174f6d742928902c2a10dd42961a368342.

Conflicts:
	drivers/net/wireless/ath/ar9170/main.c
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/mwl8k.c
	drivers/net/wireless/wl12xx/wl1251_main.c
	drivers/net/wireless/wl12xx/wl1271_main.c
	include/net/mac80211.h
	net/mac80211/driver-ops.h
	net/mac80211/iface.c
	net/mac80211/pm.c
	net/mac80211/util.c