tree d05dbf49cacc211db26abc552801384b48371742
parent 5454a47cfcc1ee32ef13bf8e4e6788ecac00f94c
parent df30ff0d6c1598c0c893e9124e36e0efa598efda
author John W. Linville <linville@tuxdriver.com> 1450102572 -0500
committer John W. Linville <linville@tuxdriver.com> 1450102572 -0500

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next