tree 9377baf652e0cd8360372020b0386e238d07a30d
parent f3116f62cb56ef5efd172371fab688bb27529f69
parent a508a6ea234571e0e7d1e9f2455fc1eca54d1fef
author John W. Linville <linville@tuxdriver.com> 1314643940 -0400
committer John W. Linville <linville@tuxdriver.com> 1314643940 -0400

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