tree 737a14af45038252fc0e3863d62dde09432cd779
parent e6e94e392fddb8845bdd2e199f55ebf7d76cb58d
parent a4881cc45a3fab4488e16c4934e149cfa620f1a9
author John W. Linville <linville@tuxdriver.com> 1345825530 -0400
committer John W. Linville <linville@tuxdriver.com> 1345825530 -0400

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