tree 674063d85501781b4aeaf8e4f97a965a22cdfa3e
parent cb4ec37d485b05decf4bdcd11724362c7f03606a
parent 8680451f38a64bd270233b3c0eeb7c45f2b5efe3
author John W. Linville <linville@tuxdriver.com> 1358882593 -0500
committer John W. Linville <linville@tuxdriver.com> 1358882593 -0500

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