ohn W. Linville <linville@tuxdriver.com> 1262204708 -0500
committer John W. Linville <linville@tuxdriver.com> 1262204708 -0500

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

Conflicts:
	drivers/net/wireless/libertas/scan.c
Ï