OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
linux/include/net/sctp
History
David S. Miller 143c905494 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/intel/i40e/i40e_main.c
	drivers/net/macvtap.c

Both minor merge hassles, simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2013-12-18 16:42:06 -05:00
..
auth.h include/net/: Fix FSF address in file headers 2013-12-06 12:37:56 -05:00
checksum.h include/net/: Fix FSF address in file headers 2013-12-06 12:37:56 -05:00
command.h include/net/: Fix FSF address in file headers 2013-12-06 12:37:56 -05:00
constants.h include/net/: Fix FSF address in file headers 2013-12-06 12:37:56 -05:00
sctp.h sctp: Fix FSF address in file headers 2013-12-06 12:37:56 -05:00
sm.h sctp: Fix FSF address in file headers 2013-12-06 12:37:56 -05:00
structs.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-12-18 16:42:06 -05:00
tsnmap.h sctp: Fix FSF address in file headers 2013-12-06 12:37:56 -05:00
ulpevent.h sctp: Fix FSF address in file headers 2013-12-06 12:37:56 -05:00
ulpqueue.h sctp: Fix FSF address in file headers 2013-12-06 12:37:56 -05:00