Files
android_kernel_xiaomi_sm8450/arch/x86/include/asm
David S. Miller b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/phy/bcm7xxx.c
	drivers/net/phy/marvell.c
	drivers/net/vxlan.c

All three conflicts were cases of simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-02-23 00:09:14 -05:00
..
2015-12-21 14:40:55 +00:00
2016-01-12 20:46:59 +02:00
2016-01-11 12:30:50 +01:00
2015-05-13 10:55:42 +02:00
2015-07-31 10:23:23 +02:00
2014-12-11 11:35:02 +01:00
2015-04-14 16:49:06 -07:00
2015-05-28 15:31:53 +02:00
2012-03-28 18:11:12 +01:00
2014-03-04 21:47:51 +01:00
2011-04-18 09:26:48 -07:00
2015-10-21 11:17:32 +02:00
2015-04-24 15:36:55 +02:00
2010-10-26 16:52:08 -07:00
2012-06-25 13:48:30 +02:00
2016-01-12 12:17:28 +01:00
2010-06-09 11:12:36 +02:00
2015-07-31 13:31:10 +02:00
2015-07-31 13:30:45 +02:00
2014-02-27 08:07:39 -08:00
2015-12-19 11:53:40 +01:00
2014-09-01 10:15:31 +02:00
2011-03-15 15:34:15 -07:00
2015-05-19 15:47:30 +02:00
2015-02-23 13:44:14 +01:00
2016-02-20 00:21:44 -05:00
2014-06-04 16:53:57 -07:00
2014-04-18 14:20:46 +02:00
2015-07-31 13:31:10 +02:00
2015-05-19 15:47:30 +02:00
2015-05-19 15:47:30 +02:00