tree 8663ca32b912e8b3df428f570b7fd376aa3aa0cb
parent 01925efdf7e03b4b803b5c9f985163d687f7f017
parent d0a361a5b3f5aa28778a0c336de5a911fc0cd678
author John W. Linville <linville@tuxdriver.com> 1383684542 -0500
committer John W. Linville <linville@tuxdriver.com> 1383684542 -0500

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

Conflicts:
	net/wireless/reg.c