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

This commit is contained in:
John W. Linville 2012-08-14 14:42:54 -04:00
commit 1e55217e17
16 changed files with 68 additions and 36 deletions