Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 28 Aug 2013 17:49:20 +0000 (13:49 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 28 Aug 2013 17:49:20 +0000 (13:49 -0400)
commitcd80e107b741f9e05c53a01e5cbe2cdf4b6074bc
treec5e95347439b75ba4bd67c566f42f7aaf7730403
parent53b2f828487ea7a3f6fa4007b629466fb0d14339
parentd70b7616d9080ec9f868fbd31db5fd4341435d61
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211
net/mac80211/mlme.c