tree 52ebaad6117abf806dab4e738d01b509839f7b12
parent bdcac1878c80b068d8e073c1691d4bd09ba9996d
parent bb52a653eaef4aee877b2fa36de8699926f788bd
author John W. Linville <linville@tuxdriver.com> 1171754769 -0500
committer John W. Linville <linville@tuxdriver.com> 1171754769 -0500

Merge branch 'upstream' into upstream-jgarzik

Conflicts:

	net/ieee80211/softmac/ieee80211softmac_module.c
	net/ieee80211/softmac/ieee80211softmac_wx.c