tree 9f3215138783d7a6cfd341e51495c1c2a725cfb4
parent 8271195e38d01f3551bb10b1c7de856cd8507882
parent 8a5b33f55452c226aa0e47d737e541985ff10e16
author John W. Linville <linville@tuxdriver.com> 1262816574 -0500
committer John W. Linville <linville@tuxdriver.com> 1262816773 -0500

Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

Conflicts:
	net/mac80211/scan.c
	net/mac80211/wme.c