David S. Miller 71a83a6db6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/rocker/rocker.c The rocker commit was two overlapping changes, one to rename the ->vport member to ->pport, and another making the bitmask expression use '1ULL' instead of plain '1'. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-03-03 21:16:48 -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-03-03 15:30:07 -08: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	net: Kill dev_rebuild_header	2015-03-02 16:43:41 -05:00
icn	isdn: icn: buffer overflow in icn_command()	2014-04-16 15:24:15 -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	net: Remove iocb argument from sendmsg and recvmsg	2015-03-02 13:06:31 -05:00
pcbit	isdn: fix misspelling of current function in string	2014-12-09 16:18:46 -05:00
sc	Drivers: Isdn: sc: Fixed coding style & spelling mistakes.	2015-01-18 00:27:53 -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