diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2017-08-24 14:29:12 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2017-08-24 14:47:42 +0300 |
| commit | 5307eca1362492ce28f1572b430997d9053c021d (patch) | |
| tree | 83402432406875153d24aa6434437b6cbfccc2f8 /drivers/net/ethernet/toshiba/tc35815.c | |
| parent | 2c1dca3c6b222a389c5dfebfcdd6fe3c87e5aa75 (diff) | |
| parent | e9bf53ab1ee34bb05c104bbfd2b77c844773f8e6 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
Stephen Rothwell reported quite a few conflicts in iwlwifi between
wireless-drivers and wireless-drivers-next. To avoid any problems later in
other trees merge w-d to w-d-next to fix those conflicts early.
Diffstat (limited to 'drivers/net/ethernet/toshiba/tc35815.c')
0 files changed, 0 insertions, 0 deletions