diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-10-27 19:09:36 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-10-27 19:09:36 +0100 |
| commit | 490f0dc4d52a01904cead9dd2fa57956ca737eb7 (patch) | |
| tree | 1f33f2c0b0318fe8d7b1ed08832ae787ba9c6627 /drivers/auxdisplay | |
| parent | Merge tag 'ntb-3.18' of git://github.com/jonmason/ntb (diff) | |
| parent | ath10k: split ce pipe init/alloc further (diff) | |
| download | linux-490f0dc4d52a01904cead9dd2fa57956ca737eb7.tar.xz linux-490f0dc4d52a01904cead9dd2fa57956ca737eb7.zip | |
Merge tag 'for-linville-20141024' of git://github.com/kvalo/ath
Conflicts:
drivers/net/wireless/ath/wil6210/wil6210.h
Diffstat (limited to 'drivers/auxdisplay')
0 files changed, 0 insertions, 0 deletions