diff options
| author | David S. Miller <davem@davemloft.net> | 2016-07-06 17:35:22 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-07-06 17:35:22 (GMT) |
| commit | 30d0844bdcea9fb8b0b3c8abfa5547bc3bcf8baa (patch) | |
| tree | 87302af9e03ee50cf135cc9ce6589f41fe3b3db1 /drivers/powercap | |
| parent | ae3e4562e2ce0149a4424c994a282955700711e7 (diff) | |
| parent | bc86765181aa26cc9afcb0a6f9f253cbb1186f26 (diff) | |
| download | linux-30d0844bdcea9fb8b0b3c8abfa5547bc3bcf8baa.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/mellanox/mlx5/core/en.h
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/usb/r8152.c
All three conflicts were overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/powercap')
0 files changed, 0 insertions, 0 deletions