commit | a50f9d5ee0f81271be49d64801bee0dfe84c2127 | [log] [tgz] |
---|---|---|
author | John W. Linville <linville@tuxdriver.com> | Mon Jan 06 14:19:18 2014 -0500 |
committer | John W. Linville <linville@tuxdriver.com> | Mon Jan 06 14:19:18 2014 -0500 |
tree | f98c2adf753ee9a18913f455da818c12e7e76df2 | |
parent | b7e047358449f8eb5cba8197b42280b676b82e54 [diff] | |
parent | 277d916fc2e959c3f106904116bb4f7b1148d47a [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211