From: John W. Linville <linville@tuxdriver.com>
Date: Sat, 17 Feb 2007 23:26:09 +0000 (-0500)
Subject: Merge branch 'upstream' into upstream-jgarzik
X-Git-Tag: v2.6.21-rc1~51^2^2
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=b312362be6d9155b66f3a26d9159e0a680fbd6c5;p=net-next-2.6.git

Merge branch 'upstream' into upstream-jgarzik

Conflicts:

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

b312362be6d9155b66f3a26d9159e0a680fbd6c5