Merge branch 'upstream-fixes' of...

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

drivers/net/wireless/hostap/hostap_hw.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1042,6 +1042,9 @@ static int prism2_reset_port(struct net_device *dev)
		dev->name, local->fragm_threshold);
		}

		/* Some firmwares lose antenna selection settings on reset */
		(void) hostap_set_antsel(local);

		return res;
		}