tree 8ae3e20d2f3619021393166fe1f50a8ca00c1c33
parent 21eb218989523b7bee28900aaec9f9296b70fa27
parent 39731b78b4afebb7501c05b68e2443a1b250b41c
author John W. Linville <linville@tuxdriver.com> 1388608796 -0500
committer John W. Linville <linville@tuxdriver.com> 1388608796 -0500

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