Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 1 Apr 2013 19:09:28 +0000 (15:09 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 1 Apr 2013 19:09:28 +0000 (15:09 -0400)
commit95bc6b8461d809d7573ad8cadae3f307a472c017
treea3c53eda59b3f9303bce86ba92186495774fba78
parent2e1253d640eb7f8707d2591c93097c1e9f9c71d5
parent382a103b2b528a3085cde4ac56fc69d92a828b72
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211