tree cc532feafb67c7a608f5c2b718c548b2c898e1b0
parent 724b9e1d75ab3401aaa081bd4efb440c1b3509db
parent b7b146c9c9a0248cc57da71244f672ebc54bbef1
author John W. Linville <linville@tuxdriver.com> 1393531551 -0500
committer John W. Linville <linville@tuxdriver.com> 1393531551 -0500

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