| commit | 95f873f2fff96c592c5d863e2a39825bd8bf0500 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Jan 27 16:59:56 2015 -0800 |
| committer | David S. Miller <davem@davemloft.net> | Tue Jan 27 16:59:56 2015 -0800 |
| tree | 0d2dd664964ba2c701aefea5b4d1e85b481045e1 | |
| parent | 8ea65f4a2dfaaf494ef42a16cbf2fea39b07450f [diff] | |
| parent | 59343cd7c4809cf7598789e1cd14563780ae4239 [diff] |
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>