tree 35d67945915b202026680a62438e07d3241ba6a2
parent 5d0feaff230c0abfe4a112e6f09f096ed99e0b2d
parent 83f0c6d1f502bd75bb4a9e31e8d64e59c6894ad1
author John W. Linville <linville@tuxdriver.com> 1358969640 -0500
committer John W. Linville <linville@tuxdriver.com> 1358969640 -0500

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