summaryrefslogtreecommitdiff
path: root/trafgen_l2.h
AgeCommit message (Expand)AuthorFilesLines
2016-10-04trafgen: l2: Add support for PFC headerVadim Kochan1-0/+21
2016-10-04trafgen: l2: Add support for IEEE 802.3X PAUSE headerVadim Kochan1-0/+5
2016-02-23trafgen: l2: Add MPLS header generationVadim Kochan1-0/+7
2016-02-02trafgen: l2: Add VLAN header generationVadim Kochan1-0/+9
2016-01-29trafgen: parser: Support "etype"/"type" keywords for EthertypeTobias Klauser1-1/+1
2016-01-28trafgen: l2: Add ARP header generation logicVadim Kochan1-0/+12
2016-01-28trafgen: l2: Add Ethernet protocol header generationVadim Kochan1-0/+12
rivate-remove&id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>include/dt-bindings/sound/fsl-imx-audmux.h parent76e0e70e6452b971a69cc9794ff4a6715c11f7f2 (diff)parent926af6273fc683cd98cd0ce7bf0d04a02eed6742 (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 'include/dt-bindings/sound/fsl-imx-audmux.h')