tree be05512153a9cd5cbe1f1234bc09fd9cd388ec58
parent 12325280dfeba18164f9c47e226a40ab34e23ee7
parent 2504a6423b9ab4c36df78227055995644de19edb
author John W. Linville <linville@tuxdriver.com> 1329341077 -0500
committer John W. Linville <linville@tuxdriver.com> 1329341077 -0500

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

Conflicts:
	net/mac80211/debugfs_sta.c
	net/mac80211/sta_info.h