Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 18 Jun 2014 18:39:25 +0000 (14:39 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 18 Jun 2014 18:39:25 +0000 (14:39 -0400)
commit2ee3f63d39dbebd94b4a77df04455617ce12156b
tree55a96da26db65b0649fb4203512f9a10b7a3f4e1
parent62a02c98ce03bb214009509a4802b7b63f59621c
parent616a8394b5df8c88f4dd416f4527439a4e365034
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem