David S. Miller 04f58c8854 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: Documentation/devicetree/bindings/net/micrel-ks8851.txt net/core/netpoll.c The net/core/netpoll.c conflict is a bug fix in 'net' happening to code which is completely removed in 'net-next'. In micrel-ks8851.txt we simply have overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-25 20:29:20 -04:00
..
act2000	isdn: whitespace coding style cleanup	2012-02-21 09:04:01 -08:00
capi	isdn/capi: Make Middleware depend on CAPI2.0	2014-03-18 15:02:57 -04:00
divert	isdn: divert, hysdn: fix interruptible_sleep_on race	2014-02-26 16:06:13 -05:00
gigaset	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-05-01 17:51:54 -07:00
hardware	isdn: remove deprecated IRQF_DISABLED	2013-10-17 15:13:20 -04:00
hisax	isdn: hisax/elsa: fix sleep_on race in elsa FSM	2014-02-26 16:06:13 -05:00
hysdn	isdn: divert, hysdn: fix interruptible_sleep_on race	2014-02-26 16:06:13 -05:00
i4l	isdn: fix multiple sleep_on races	2014-02-26 16:06:13 -05:00
icn	isdn: icn: NULL dereference printing error message	2013-11-07 19:11:13 -05:00
isdnloop	isdnloop: use strlcpy() instead of strcpy()	2013-11-14 16:50:20 -05:00
mISDN	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-01-25 11:17:34 -08:00
pcbit	isdn: pcbit: fix interruptible_sleep_on race	2014-02-26 16:06:12 -05:00
sc	isdn: use strlcpy() instead strcpy()	2013-12-18 17:53:59 -05:00
Kconfig	tty: Added a CONFIG_TTY option to allow removal of TTY	2013-01-18 16:15:27 -08:00
Makefile