tree 673c6ecfc34c7534503be739e0be777ee6422424
parent 7c3ee9e3fd065e878a2dbaec9d417441c59799be
parent 479600777bb588724d044815415f7d708d06644b
author John W. Linville <linville@tuxdriver.com> 1296579687 -0500
committer John W. Linville <linville@tuxdriver.com> 1296579687 -0500

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

Conflicts:
	drivers/net/wireless/wl12xx/spi.c