tree 2feebdcde51f65dc25334fd56cc33e1547a86930
parent 5a8887d39e1ba5ee2d4ccb94b14d6f2dce5ddfca
parent ed90542b0ce5415050c6fbfca324bccaafa69f2f
author John W. Linville <linville@tuxdriver.com> 1336058595 -0400
committer John W. Linville <linville@tuxdriver.com> 1336058595 -0400

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