tree ed690568a27b7231b8a507e8ba07c1ae34868e5c
parent c5e818ef081c4144177fdbdeed154332cd7e4d7a
parent 83f0c6d1f502bd75bb4a9e31e8d64e59c6894ad1
author John W. Linville <linville@tuxdriver.com> 1359399243 -0500
committer John W. Linville <linville@tuxdriver.com> 1359399243 -0500

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

Conflicts:
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/iwlwifi/dvm/tx.c