David S. Miller 8fd90bb889 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/infiniband/hw/cxgb4/device.c The cxgb4 conflict was simply overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-07-22 00:44:59 -07:00
..
act2000	isdn: replace del_timer by del_timer_sync	2014-03-27 15:28:06 -04:00
capi	isdn/capi: fix (middleware) device nodes	2014-06-04 23:13:41 -07: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: l3ni1.c: Fix for possible null pointer dereference	2014-07-08 16:06:21 -07:00
hysdn	isdn: divert, hysdn: fix interruptible_sleep_on race	2014-02-26 16:06:13 -05:00
i4l	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-07-22 00:44:59 -07:00
icn	isdn: icn: buffer overflow in icn_command()	2014-04-16 15:24:15 -04:00
isdnloop	isdnloop: several buffer overflows	2014-04-08 12:41:13 -04:00
mISDN	mISDN: Use mod_timer()	2014-05-22 15:50:12 -04:00
pcbit	isdn: pcbit: fix interruptible_sleep_on race	2014-02-26 16:06:12 -05:00
sc	isdn: replace del_timer by del_timer_sync	2014-03-27 15:28:06 -04: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