tree c93e40197d4614b5183f86f0335c5c7abcee31aa
parent 94dace10142790ddeb0a3a7b8b33d9540d30c79f
parent a8a48e60a468084ef6ec23c78e8903c9e0ba7a4c
author John W. Linville <linville@tuxdriver.com> 1367263917 -0400
committer John W. Linville <linville@tuxdriver.com> 1367263917 -0400

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