tree 7e6fe4f8c3c126496b737962537d51645a826c2c
parent 4a0c3d9fd1af83ad0519997043467b817d3738fc
parent e03bbb62cfdf539ae8110b297493c685f9d12774
author John W. Linville <linville@tuxdriver.com> 1398193284 -0400
committer John W. Linville <linville@tuxdriver.com> 1398193284 -0400

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next