Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 18 Oct 2013 17:35:39 +0000 (13:35 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 18 Oct 2013 17:35:39 +0000 (13:35 -0400)
commit334300f247abc4f21124ff3ac192df5222ea79bf
tree6987fe992930e0f75f1064977047b48aee355cbf
parent8245d02369859cc5c87b71722b327396d7a3ae75
parent095d81cee742fc31e1218077ca6ca8f0df07c613
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211