Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 14 Apr 2014 17:47:01 +0000 (13:47 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 14 Apr 2014 17:47:01 +0000 (13:47 -0400)
commit08e22e193a0080d53dd0669c4f6422f602bb643c
treeb85c76ba6466fce48bbce4500d49f142aa0bf263
parent321d03c86732e45f5f33ad0db5b68e2e1364acb9
parent764152ff66f4a8be1f9d7981e542ffdaa5bd7aff
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211