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
..
act2000	isdn: act200: fix MODULE_PARM_DESC() typo	2016-01-08 13:24:20 -05:00
capi	isdn/capi: Use setup_timer	2015-05-31 21:36:37 -07:00
divert
gigaset	ser_gigaset: use container_of() instead of detour	2016-02-19 15:52:41 -05:00
hardware	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
hisax	isdn: Partially revert debug format string usage clean up	2015-11-25 11:49:58 -05:00
hysdn	isdn: fix misspelling of current function in string	2014-12-09 16:18:46 -05:00
i4l	isdn: remove spellcaster driver	2015-12-01 16:06:44 -05:00
icn	arch, drivers: don't include <asm/io.h> directly, use <linux/io.h> instead	2015-08-10 23:07:05 -04:00
isdnloop	drivers: isdn: isdnloop: isdnloop.c: Remove parenthesis around return values, as specified in CodingStyle.	2015-02-05 15:40:23 -08:00
mISDN	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-24 06:54:12 -07:00
pcbit	isdn: fix misspelling of current function in string	2014-12-09 16:18:46 -05:00
Kconfig
Makefile	isdn: remove spellcaster driver	2015-12-01 16:06:44 -05:00