Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 22 Aug 2013 15:35:22 +0000 (11:35 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 22 Aug 2013 15:35:22 +0000 (11:35 -0400)
commit89b5f74a268d6a7037c8ea9d9b7d4ce35097c6fd
tree15e14665089f6603c07e4bfc8ba4011f97a23744
parent48c3e371350701444db51e8b35b5928d74dbacc3
parent75a423f493ffdf741acae27bf179cd560f7813d7
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211