tree 5ae7ebd942fe3f2246a52d18f35f67d3db4e4b5c
parent 2b5e54e22f596bcd9ec0018f228a2606e016a108
parent 6c7c4cbfd5f59c04a40af67ad72d14e19215ef36
author John W. Linville <linville@tuxdriver.com> 1372099499 -0400
committer John W. Linville <linville@tuxdriver.com> 1372099499 -0400

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