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
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
hardware
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
isdnloop
mISDN
pcbit
sc
Kconfig
Makefile