David S. Miller 3f3558bb51 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/xen-netfront.c Minor overlapping changes in xen-netfront.c, mostly to do with some buffer management changes alongside the split of stats into TX and RX. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-01-15 00:53:17 -05:00
..
act2000	isdn: replace del_timer by del_timer_sync	2014-03-27 15:28:06 -04:00
capi	isdn/capi: correct argument types of command_2_index	2014-12-10 15:06:10 -05:00
divert	isdn: divert, hysdn: fix interruptible_sleep_on race	2014-02-26 16:06:13 -05:00
gigaset	isdn/gigaset: enable Kernel CAPI support by default	2014-12-10 15:06:10 -05:00
hardware	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-15 00:53:17 -05:00
hisax	isdn: hisax: hfc4s8s_l1: Remove some unused functions	2015-01-02 16:36:08 -05:00
hysdn	isdn: fix misspelling of current function in string	2014-12-09 16:18:46 -05:00
i4l	isdn: i4l: Remove ASYNC_CTS_FLOW	2014-09-23 21:19:35 -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	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2014-12-12 10:08:06 -08:00
pcbit	isdn: fix misspelling of current function in string	2014-12-09 16:18:46 -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