Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 28 May 2013 17:38:53 +0000 (13:38 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 28 May 2013 17:38:53 +0000 (13:38 -0400)
commitd61bdbf1235b7a11b29197b538bbee41855eaf38
treee60008e184176ceb1d9db9da696326b18c3ccd15
parent86c157b3f83597e11d8f03a9dece98d1e77a8ce7
parentac20976dcaeea3e77e40e9aac8f3799d2a22ea2b
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211