Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 24 Jul 2013 15:50:38 +0000 (11:50 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 24 Jul 2013 15:50:38 +0000 (11:50 -0400)
commit18e1ccb6ca35f995006749d20d9bd6ef40d736fd
tree7a96700d25c8eccee870ef8e941bf714055a9c89
parentf8c0aca9fda7856a8a8d61d523ba3187affbd714
parent23d412a2e94f55b84dbf9d5e64f381677bc90575
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem