Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 24 Jun 2013 18:44:59 +0000 (14:44 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 24 Jun 2013 18:44:59 +0000 (14:44 -0400)
commit773a4639d69bfb44a166a53f1ccc6b525390260e
tree5ae7ebd942fe3f2246a52d18f35f67d3db4e4b5c
parentfa0261878bbdbf78b1cd99872cb2d70724ce5df6
parentf2c39f72334b061e28fc1274165bcea1db2c6c8b
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next