]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4df9513 1612e11)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 7 Jun 2013 06:39:26 +0000 (23:39 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 7 Jun 2013 06:39:26 +0000 (23:39 -0700)
Merge 'net' into 'net-next' to get the MSG_CMSG_COMPAT
regression fix.

Signed-off-by: David S. Miller <davem@davemloft.net>
1  2 
net/socket.c patch | diff1 | diff2 | blob | history

diff --cc net/socket.c
Simple merge
Linux kernel for KaRo TX COM modules