tree 53aa9e61aa7fd0c225528fba4144b2d15f709ad9
parent cd80e107b741f9e05c53a01e5cbe2cdf4b6074bc
parent a98655387762394371b88cdfb8215884757978ab
author John W. Linville <linville@tuxdriver.com> 1377712300 -0400
committer John W. Linville <linville@tuxdriver.com> 1377712300 -0400

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next