diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-06-22 17:22:06 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-06-22 17:22:06 +0300 |
| commit | 817a3125819983956bb8a22455a569aac4e8ea34 (patch) | |
| tree | 745a6efbce4a42f33abf2979fff8e6be6a9f6e86 /drivers/net/wireless/iwlwifi/mvm/fw-api-coex.h | |
| parent | 7250dc3fee806eb2b7560ab7d6072302e7ae8cf8 (diff) | |
| parent | 74a3e0c719dcfc66333f43a8414a9c5bfc50bf95 (diff) | |
| parent | 8a09b4fadf320cef081e1539975a97793cfb9076 (diff) | |
| download | linux-817a3125819983956bb8a22455a569aac4e8ea34.tar.xz | |
Merge branches 'for-4.1/upstream-fixes', 'for-4.2/upstream' and 'for-4.2/logitech' into for-linus
Conflicts:
drivers/hid/hid-logitech-hidpp.c