commit | d421c62e37c9c83496fa721d4f4cd4a6cae82151 | [log] [tgz] |
---|---|---|
author | John W. Linville <linville@tuxdriver.com> | Thu Feb 20 15:37:15 2014 -0500 |
committer | John W. Linville <linville@tuxdriver.com> | Thu Feb 20 15:40:14 2014 -0500 |
tree | 4df4b31e17998e0b7531deb904959f6af9ad6d26 | |
parent | 4885c8731a34eecf509822e089ce17bcd9bd4650 [diff] | |
parent | e3685e03b40f5ec7926d9a75bf63467fc4071df9 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211