| commit | f6d3125fa3c2f55ddf7cf69365c41089de6cfae6 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Oct 02 07:21:25 2015 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Fri Oct 02 07:21:25 2015 -0700 |
| tree | ff2bcb135ebf090d7b383d55123b621f4590632c | |
| parent | 2dc6a0303b89de4c92b44f5278d61b6b6c9c20eb [diff] | |
| parent | 36f8dafe52b0d0726edd5102900e37192f1d3c65 [diff] |
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>