Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 11 Dec 2013 15:41:56 +0000 (10:41 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 11 Dec 2013 15:41:56 +0000 (10:41 -0500)
commit33457ff7cdd48c54723ab8c550deec28dd904659
treeb22fc8b4782aa958b3d692caaf3daf7d0b580432
parent8afdd99a1315e759de04ad6e2344f0c5f17ecb1b
parentbbf807bc0697e577c137a5fffb30fca7c6a45da1
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem