Files
i2som-imx-linux/include/linux
David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/asix_common.c
	net/ipv4/inet_connection_sock.c
	net/switchdev/switchdev.c

In the inet_connection_sock.c case the request socket hashing scheme
is completely different in net-next.

The other two conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-20 06:08:27 -07:00
..
2015-09-16 20:44:47 +01:00
2015-09-08 15:35:28 -07:00
2015-10-01 21:42:35 -04:00
2015-10-01 21:42:35 -04:00
2015-10-08 05:26:35 -07:00
2015-09-10 13:29:01 -07:00
2015-09-10 13:29:01 -07:00
2015-09-10 13:29:01 -07:00
2015-09-08 15:35:28 -07:00
2015-10-03 05:05:18 -07:00
2015-09-10 15:36:59 -04:00
2015-10-12 19:28:24 -07:00
2015-09-08 15:35:28 -07:00
2015-09-10 13:29:01 -07:00