Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 4 Jan 2013 21:05:14 +0000 (16:05 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 4 Jan 2013 21:05:14 +0000 (16:05 -0500)
commitd339fc8980955faca38141a4483761241b62e7c4
tree12018549a124bd81b30e7ce383c86d27a823b91d
parent9a6f7347f59f55433ec50578e8d42d305e0d53ae
parent09b1426e7fcec510aba55a761da5004e47a11ce3
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211