diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-11 11:17:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-11 11:17:54 -0800 |
| commit | 69973b830859bc6529a7a0468ba0d80ee5117826 (patch) | |
| tree | 5f11fe15ed9d9a3ab9c92242030e54b73ecdce45 /sound | |
| parent | 2e4333c14de06a333783d6812cf3c4998f78b0c8 (diff) | |
Linux 4.9
Diffstat (limited to 'sound')
| parent | 76e0e70e6452b971a69cc9794ff4a6715c11f7f2 (diff) | |
|---|---|---|
| parent | 926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the
netvsc driver in 'net' and an optimization of the RX path
in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/testing/selftests/static_keys')