diff options
| author | David S. Miller <davem@davemloft.net> | 2017-07-03 03:42:10 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-07-03 03:42:10 -0700 |
| commit | 3a3f7d130eb5c219a1a4b183b92106028747dc85 (patch) | |
| tree | c089ee16fe465b94b473c92b834cab08ca57352d /security/tomoyo | |
| parent | 784c372a8184bdb8ae722c94250c2d57dc327a8e (diff) | |
| parent | ea23b42739a2c3c1158344928048fff8c70d1f66 (diff) | |
Merge https://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Some overlapping changes in the mlx5 driver.
A merge conflict resolution posted by Stephen Rothwell was used as a
guide.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'security/tomoyo')
0 files changed, 0 insertions, 0 deletions