git.ipfire.org Git - people/arne_f/kernel.git/commit

]> git.ipfire.org Git - people/arne_f/kernel.git/commit

projects / people / arne_f / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5c398b3 0b9c3a4)

author	Arne Fitzenreiter <arne_f@ipfire.org>
	Wed, 15 Oct 2014 14:05:01 +0000 (16:05 +0200)
committer	Arne Fitzenreiter <arne_f@ipfire.org>
	Wed, 15 Oct 2014 14:05:01 +0000 (16:05 +0200)
commit	6d8870b923d4a6f549d4da269f776d1619452609
tree	3cffb552690ac3780e9f1d05c5ad669f22ddcd85	tree \| snapshot
parent	5c398b34cd93fae644f5b094a5897e923d646357	commit \| diff
parent	0b9c3a46536a5be91175e280882f74890e617eef	commit \| diff

Merge tag 'v3.10.58' into linux-3.10.x-grsecurity-2.9.1

This is the 3.10.58 stable release

Conflicts:
include/net/inet_connection_sock.h

Makefile	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/hub.c	diff1 \|	diff2 \|	blob \| history
include/net/inet_connection_sock.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_gre.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/sit.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/packet/af_packet.c	diff1 \|	diff2 \|	blob \| history

Arne's tree of linux kernel.