Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 30 Sep 2013 20:14:27 +0000 (16:14 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 30 Sep 2013 20:14:27 +0000 (16:14 -0400)
commit15214c2f6cb15387e3bb06621010dd5609aba709
tree7f2edaa59a29e8be2eee95cddb302f33429f4cb0
parentc7515d2365a6b8a018950198ebe1f5be793cd4bb
parentaa5f66d5a1df1c2b04bccdcb19711675c765d7c4
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211