| commit | 490f0dc4d52a01904cead9dd2fa57956ca737eb7 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Mon Oct 27 14:09:36 2014 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Mon Oct 27 14:09:36 2014 -0400 |
| tree | 1f33f2c0b0318fe8d7b1ed08832ae787ba9c6627 | |
| parent | 61ed53deb1c6a4386d8710dbbfcee8779c381931 [diff] | |
| parent | 84cbf3a7592879810f80cece6c7f736f099ab163 [diff] |
Merge tag 'for-linville-20141024' of git://github.com/kvalo/ath Conflicts: drivers/net/wireless/ath/wil6210/wil6210.h