diff options
author | David S. Miller <davem@davemloft.net> | 2015-10-02 16:21:25 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-10-02 16:21:25 +0200 |
commit | f6d3125fa3c2f55ddf7cf69365c41089de6cfae6 (patch) | |
tree | ff2bcb135ebf090d7b383d55123b621f4590632c /lib/Makefile | |
parent | Merge branch 'bridge_vlan_cleanups_fixes' (diff) | |
parent | Merge tag 'mmc-v4.3-rc3' of git://git.linaro.org/people/ulf.hansson/mmc (diff) | |
download | linux-f6d3125fa3c2f55ddf7cf69365c41089de6cfae6.tar.xz linux-f6d3125fa3c2f55ddf7cf69365c41089de6cfae6.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/dsa/slave.c
net/dsa/slave.c simply had overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib/Makefile')
0 files changed, 0 insertions, 0 deletions