David S. Miller f188b951f3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/renesas/ravb_main.c kernel/bpf/syscall.c net/ipv4/ipmr.c All three conflicts were cases of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-12-03 21:09:12 -05:00
..
act2000	isdn: replace del_timer by del_timer_sync	2014-03-27 15:28:06 -04:00
capi	isdn/capi: Use setup_timer	2015-05-31 21:36:37 -07:00
divert	isdn: divert, hysdn: fix interruptible_sleep_on race	2014-02-26 16:06:13 -05:00
gigaset	isdn/gigaset: drop unused ldisc methods	2015-07-15 17:24:45 -07:00
hardware	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2015-04-14 09:50:27 -07:00
hisax	isdn: Partially revert debug format string usage clean up	2015-11-25 11:49:58 -05:00
hysdn	isdn: fix misspelling of current function in string	2014-12-09 16:18:46 -05:00
i4l	isdn: remove spellcaster driver	2015-12-01 16:06:44 -05:00
icn	arch, drivers: don't include <asm/io.h> directly, use <linux/io.h> instead	2015-08-10 23:07:05 -04:00
isdnloop	drivers: isdn: isdnloop: isdnloop.c: Remove parenthesis around return values, as specified in CodingStyle.	2015-02-05 15:40:23 -08:00
mISDN	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-24 06:54:12 -07:00
pcbit	isdn: fix misspelling of current function in string	2014-12-09 16:18:46 -05:00
Kconfig	tty: Added a CONFIG_TTY option to allow removal of TTY	2013-01-18 16:15:27 -08:00
Makefile	isdn: remove spellcaster driver	2015-12-01 16:06:44 -05:00