tree 515bdf9875c34447c51ed7512749bbaa93641588
parent 8c8d2017ba25c510ddf093419048460db1109bc4
parent 795d855d56c6d172f50a974f603ba923ac93ee76
author John W. Linville <linville@tuxdriver.com> 1371061608 -0400
committer John W. Linville <linville@tuxdriver.com> 1371061608 -0400

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