Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 17 Jul 2012 19:07:31 +0000 (15:07 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 17 Jul 2012 19:07:31 +0000 (15:07 -0400)
commit707be0ae13f7a4533d11f0d88687223c4bd8f85f
treecf2c9fa680828ea4a9882ee2561e9b12d643adbe
parent040a78314fe3cbb1472ac220cb3400116f6967bc
parent88bc40e8c3d3bca7d26c756bb0b823d4abad3355
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next
net/mac80211/mlme.c