diff options
| author | David S. Miller <davem@davemloft.net> | 2013-12-18 16:42:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-18 16:42:06 -0500 |
| commit | 143c9054949436cb05e468439dc5e46231f33d09 (patch) | |
| tree | c2e972d8188fb1b36368e9acb5b6b59466c9d903 /include/media/videobuf-dvb.h | |
| parent | 0b6807034791160d5e584138943d2daea765436d (diff) | |
| parent | 35eecf052250f663f07a4cded7d3503fd1b50729 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/macvtap.c
Both minor merge hassles, simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/media/videobuf-dvb.h')
0 files changed, 0 insertions, 0 deletions