David S. Miller 56a4342dfe Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c net/ipv6/ip6_tunnel.c net/ipv6/ip6_vti.c ipv6 tunnel statistic bug fixes conflicting with consolidation into generic sw per-cpu net stats. qlogic conflict between queue counting bug fix and the addition of multiple MAC address support. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-01-06 17:37:45 -05:00
..
act2000	isdn: whitespace coding style cleanup	2012-02-21 09:04:01 -08:00
capi	isdn/kcapi: fix a small underflow	2013-05-20 13:38:14 -07:00
divert	ISDN:divert: beautify code: useless 'break', 'return (0)', additional comments.	2013-04-02 14:31:24 -04: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: Drop big endian cpp checks from telespci and hfc_pci drivers	2014-01-06 15:50:51 -05:00
hysdn	procfs: new helper - PDE_DATA(inode)	2013-04-09 14:13:32 -04:00
i4l	isdn: slight optimization of addr compare	2013-12-26 13:31:34 -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	net: rework recvmsg handler msg_name and msg_namelen logic	2013-11-20 21:52:30 -05:00
pcbit	isdn: Fix typo in drivers/isdn	2012-11-09 17:10:16 -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	mISDN fix main ISDN Makefile	2008-08-02 16:28:20 +02:00