diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2014-12-12 13:09:23 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-12-12 13:09:23 +0300 |
| commit | 3ee420ba2e7fa074a668e30c2d0f4abd317e4927 (patch) | |
| tree | b195f683a4873c0bf5357b1d993df344e67b96d4 /drivers/net/wireless/rtlwifi/rtl8192ee/fw.h | |
| parent | a32c99e7ab8410bae7c276a7e94ca84d108de034 (diff) | |
| parent | d1c7e29e8d276c669e8790bb8be9f505ddc48888 (diff) | |
| parent | 7bb9d643651180f081cfcc1ed43ff685eda8a358 (diff) | |
| download | linux-3ee420ba2e7fa074a668e30c2d0f4abd317e4927.tar.xz | |
Merge branches 'for-3.18/upstream-fixes' and 'for-3.19/upstream' into for-linus
Conflicts:
drivers/hid/hid-input.c