| commit | 60747ef4d173c2747bf7f0377fb22846cb422195 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Aug 18 01:17:32 2016 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Thu Aug 18 01:17:32 2016 -0400 |
| tree | ea0faf33b952495c47909be1400c475a3f3821b0 | |
| parent | 484334198f8ce9552e20930fff9408ebf6bcf94d [diff] | |
| parent | 184ca823481c99dadd7d946e5afd4bb921eab30d [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Minor overlapping changes for both merge conflicts. Resolution work done by Stephen Rothwell was used as a reference. Signed-off-by: David S. Miller <davem@davemloft.net>