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

Browse source

Merge 'net' into 'net-next' to get the MSG_CMSG_COMPAT
regression fix.

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2013-06-06 23:39:26 -07:00

parent 4df95131ea 1612e111e4

commit 93a306aef5

58 changed files with 519 additions and 322 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

17

include/asm-generic/tlb.h

View file

3

include/linux/socket.h

View file