tree b4b5fac6f2f1908aebf49f63805f07f4ec58abb9
parent 5dc5503f5a400be5a7dc611745a034f04b0679b8
parent 2a1e0fd175dcfd72096ba9291d31e3b1b5342e60
author John W. Linville <linville@tuxdriver.com> 1322680482 -0500
committer John W. Linville <linville@tuxdriver.com> 1322680482 -0500

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