linux/drivers/isdn
David S. Miller 9d367eddf3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/bonding/bond_main.c
	drivers/net/ethernet/mellanox/mlxsw/spectrum.h
	drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c

The bond_main.c and mellanox switch conflicts were cases of
overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-01-11 23:55:43 -05:00
..
act2000 isdn: act200: fix MODULE_PARM_DESC() typo 2016-01-08 13:24:20 -05:00
capi
divert
gigaset ser_gigaset: remove unnecessary kfree() calls from release method 2015-12-15 13:24:21 -05:00
hardware
hisax
hysdn
i4l
icn
isdnloop
mISDN
pcbit
Kconfig
Makefile