Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 6 Jan 2014 19:19:18 +0000 (14:19 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 6 Jan 2014 19:19:18 +0000 (14:19 -0500)
commita50f9d5ee0f81271be49d64801bee0dfe84c2127
treef98c2adf753ee9a18913f455da818c12e7e76df2
parentb7e047358449f8eb5cba8197b42280b676b82e54
parent277d916fc2e959c3f106904116bb4f7b1148d47a
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211