tree 2890ffcf40fab2d2c24d2d208814afeb52bb12e5
parent 0efdf2626676db4b30d343ff88f8461ad09130da
parent 720eeb4332e5871c97d390b2fb55a5a74fb18ae6
author Jeff Garzik <jeff@garzik.org> 1165485760 -0500
committer Jeff Garzik <jeff@garzik.org> 1165485760 -0500

Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream

Conflicts:

	drivers/net/wireless/zd1211rw/zd_mac.h
	net/ieee80211/softmac/ieee80211softmac_assoc.c