Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 10 Oct 2013 17:38:50 +0000 (13:38 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 10 Oct 2013 17:38:50 +0000 (13:38 -0400)
commite9517fecf2ec6497fccb2c14ea0c014bda8b113a
treeb3b9ff55caab1849c6c7ea6698f6aa4962ce57fb
parent274dede8c52036a1849ea970fab8d185fb0dce2b
parent7578d57520f51093f590d68e16965e2714e69747
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next