David S. Miller 58717686cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c drivers/net/ethernet/emulex/benet/be.h include/net/tcp.h net/mac802154/mac802154.h Most conflicts were minor overlapping stuff. The be2net driver brought in some fixes that added __vlan_put_tag calls, which in net-next take an additional argument. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-04-30 03:55:20 -04:00
..
act2000	isdn: whitespace coding style cleanup	2012-02-21 09:04:01 -08:00
capi	driver: isdn: capi: remove cast for kmalloc return value	2013-03-12 11:40:54 -04:00
divert	ISDN:divert: beautify code: useless 'break', 'return (0)', additional comments.	2013-04-02 14:31:24 -04:00
gigaset	tty/serial patches for 3.9-rc1	2013-02-21 13:41:04 -08:00
hardware	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-02-26 20:16:07 -08:00
hisax	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-03-20 12:46:26 -04:00
hysdn	new helper: file_inode(file)	2013-02-22 23:31:31 -05:00
i4l	net: add ETH_P_802_3_MIN	2013-03-28 01:20:42 -04:00
icn	isdn: whitespace coding style cleanup	2012-02-21 09:04:01 -08:00
isdnloop	isdnloop: fix and simplify isdnloop_init()	2012-08-03 16:53:22 -07:00
mISDN	isdn: mISDN: set ->family in ->getname()	2013-04-25 01:47:58 -04:00
pcbit	isdn: Fix typo in drivers/isdn	2012-11-09 17:10:16 -05:00
sc	isdn/sc: Fix incorrect module_param_array types	2013-04-25 04:23:32 -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