tree 3875181429010e58416ab34e6c06ef42de52e756
parent d8d1f30b95a635dbd610dcc5eb641aca8f4768cf
parent 832c10fd733893f86c63bde1c65b005d5a2fe346
author David S. Miller <davem@davemloft.net> 1276281246 -0700
committer David S. Miller <davem@davemloft.net> 1276281246 -0700

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

Conflicts:
	drivers/net/wireless/wl12xx/wl1271.h
	drivers/net/wireless/wl12xx/wl1271_cmd.h