apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse Source 
Conflicts:
	drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
This commit is contained in:
David S. Miller
2012-07-19 11:17:30 -07:00
parent 67da22d23f 3e4b9459fb
commit abaa72d7fd
346 changed files with 3376 additions and 2221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/ax25/af_ax25.c
+1
View File
@@ -842,6 +842,7 @@ static int ax25_create(struct net *net, struct socket *sock, int protocol,
case AX25_P_NETROM:
if (ax25_protocol_is_registered(AX25_P_NETROM))
return -ESOCKTNOSUPPORT;
break;
#endif
#ifdef CONFIG_ROSE_MODULE
case AX25_P_ROSE: