tree 7ee6244ea7c0be81a541d4e57783f83c4dfd7d66
parent 5e6700b3bf98fe98d630bf9c939ad4c85ce95592
parent 0f817ed52d07873cd39c9d3f6d87fae962dc742f
author John W. Linville <linville@tuxdriver.com> 1372439901 -0400
committer John W. Linville <linville@tuxdriver.com> 1372439901 -0400

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

Conflicts:
	net/wireless/nl80211.c