tree 58416d00380ad1122acee71b594b26ab9a201e48
parent 2cdf359a521bb72286b6714478dfdbcd2691f3fe
parent c82b5a74cc739385db6e4275fe504a0e9469bf01
author John W. Linville <linville@tuxdriver.com> 1375385212 -0400
committer John W. Linville <linville@tuxdriver.com> 1375385212 -0400

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