tree 25d4df186cd631810ff15a8e7d37cb6cdd806cdb
parent 6e5c2b4e8addfaab8ef54dedaf7b607e1585c35b
parent cd87a2d3a33d75a646f1aa1aa2ee5bf712d6f963
author John W. Linville <linville@tuxdriver.com> 1285357954 -0400
committer John W. Linville <linville@tuxdriver.com> 1285357954 -0400

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

Conflicts:
	drivers/net/wireless/ath/ath5k/base.c
	net/mac80211/main.c