diff options
| author | David S. Miller | 2015-01-28 01:59:56 +0100 |
|---|---|---|
| committer | David S. Miller | 2015-01-28 01:59:56 +0100 |
| commit | 95f873f2fff96c592c5d863e2a39825bd8bf0500 (patch) | |
| tree | 0d2dd664964ba2c701aefea5b4d1e85b481045e1 /drivers/net/macvtap.c | |
| parent | netlink: Kill redundant net argument in netlink_insert (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | kernel-qcow2-linux-95f873f2fff96c592c5d863e2a39825bd8bf0500.tar.gz kernel-qcow2-linux-95f873f2fff96c592c5d863e2a39825bd8bf0500.tar.xz kernel-qcow2-linux-95f873f2fff96c592c5d863e2a39825bd8bf0500.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
arch/arm/boot/dts/imx6sx-sdb.dts
net/sched/cls_bpf.c
Two simple sets of overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/macvtap.c')
0 files changed, 0 insertions, 0 deletions