android_kernel_samsung_univ.../net
Ingo Molnar fb10d5b7ef Merge branch 'linus' into sched/core
Resolve cherry-picking conflicts:

Conflicts:
	mm/huge_memory.c
	mm/memory.c
	mm/mprotect.c

See this upstream merge commit for more details:

  52469b4fcd Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2013-11-01 08:24:41 +01:00
..
9p
802
8021q net: vlan: fix nlmsg size calculation in vlan_get_size() 2013-10-08 16:32:41 -04:00
appletalk
atm
ax25
batman-adv
bluetooth
bridge Revert "bridge: only expire the mdb entry when query is received" 2013-10-22 14:41:02 -04:00
caif
can
ceph
core net: secure_seq: Fix warning when CONFIG_IPV6 and CONFIG_INET are not selected 2013-10-09 12:59:57 -04:00
dcb
dccp
decnet
dns_resolver
dsa
ethernet
ieee802154 6lowpan: Sync default hardware address of lowpan links to their wpan 2013-10-08 15:28:37 -04:00
ipv4 tcp: initialize passive-side sk_pacing_rate after 3WHS 2013-10-21 18:56:23 -04:00
ipv6 ipv6: probe routes asynchronous in rt6_probe 2013-10-21 18:56:22 -04:00
ipx
irda sched/wait: Make the __wait_event*() interface more friendly 2013-10-04 10:16:25 +02:00
iucv
key
l2tp l2tp: must disable bh before calling l2tp_xmit_skb() 2013-10-11 16:51:37 -04:00
lapb
llc
mac80211 mac80211: fix crash if bitrate calculation goes wrong 2013-10-14 09:47:08 +02:00
mac802154
mpls
netfilter Merge branch 'linus' into sched/core 2013-11-01 08:24:41 +01:00
netlabel
netlink
netrom
nfc
openvswitch
packet
phonet
rds
rfkill
rose
rxrpc
sched netem: free skb's in tree on reset 2013-10-11 17:30:38 -04:00
sctp sctp: Perform software checksum if packet has to be fragmented. 2013-10-17 15:24:44 -04:00
sunrpc
tipc
unix net: unix: inherit SOCK_PASS{CRED, SEC} flags from socket to fix race 2013-10-19 18:50:15 -04:00
vmw_vsock
wimax
wireless wireless: radiotap: fix parsing buffer overrun 2013-10-14 09:47:00 +02:00
x25
xfrm xfrm: check for a vaild skb in xfrm_policy_queue_process 2013-10-08 10:49:51 +02:00
compat.c net: heap overflow in __audit_sockaddr() 2013-10-03 16:05:14 -04:00
Kconfig
Makefile
nonet.c
socket.c net: heap overflow in __audit_sockaddr() 2013-10-03 16:05:14 -04:00
sysctl_net.c net: Update the sysctl permissions handler to test effective uid/gid 2013-10-07 15:57:56 -04:00