27039a675cfb25dc342b403ab
author David S. Miller <davem@davemloft.net> 1240702606 -0700
committer David S. Miller <davem@davemloft.net> 1240702606 -0700

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

Conflicts:
	net/mac80211/pm.c
O=}