| commit | 101c431492d297dd0d111b461d8d324895676bee | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Wed Mar 15 11:59:10 2017 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Wed Mar 15 11:59:10 2017 -0700 |
| tree | 06d8a02a4fd91acdd6c31340452e85feaac4ecb7 | |
| parent | 9c79ddaa0f962d1f26537a670b0652ff509a6fe0 [diff] | |
| parent | 95422dec6bd4a7c57444743f7b1bb375335a6298 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts: drivers/net/ethernet/broadcom/genet/bcmgenet.c net/core/sock.c Conflicts were overlapping changes in bcmgenet and the lockdep handling of sockets. Signed-off-by: David S. Miller <davem@davemloft.net>