diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/tc_act/tc_ife.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/net/tc_act/tc_ife.h b/include/net/tc_act/tc_ife.h3efa70d78f218e4c9276b0bac0545e5184c1c47b'>3efa70d78f218e4c9276b0bac0545e5184c1c47b (patch) | ||
| tree | f4abe2f05e173023d2a262afd4aebb1e89fe6985 /net/irda/ircomm/Kconfig | |
|---|---|---|
| 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 'net/irda/ircomm/Kconfig')