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
..
avm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-05-01 17:51:54 -07:00
eicon	isdn: divamnt: use y2038-safe ktime_get_ts64() for trace data timestamps	2016-02-18 11:09:30 -05:00
mISDN	mISDN: prevent possible NULL pointer dereference	2016-02-18 14:59:35 -05:00
Kconfig
Makefile