diff options
Diffstat (limited to 'tools/build/tests/ex/d.c')
| 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 'sound/core/misc.c')