Mark Brown 40329a6815 Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android ...

Conflicts:
	net/wireless/nl80211.c

2014-06-19 11:42:18 +01:00

..

9p

9p/trans_virtio.c: Fix broken zero-copy on vmalloc() buffers

2014-03-06 21:30:03 -08:00

802

net/802/mrp: fix lockdep splat

2013-05-14 13:02:30 -07:00

8021q

vlan: Fix lockdep warning when vlan dev handle notification

2014-05-30 21:52:15 -07:00

appletalk

net: rework recvmsg handler msg_name and msg_namelen logic

2013-12-08 07:29:25 -08:00

atm

net: rework recvmsg handler msg_name and msg_namelen logic

2013-12-08 07:29:25 -08:00

ax25

net: rework recvmsg handler msg_name and msg_namelen logic

2013-12-08 07:29:25 -08:00

batman-adv

batman-adv: set up network coding packet handlers during module init

2013-11-20 12:27:47 -08:00

bluetooth

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

2014-06-09 12:57:26 +08:00

bridge

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

2014-06-01 17:31:46 +01:00

caif

net: rework recvmsg handler msg_name and msg_namelen logic

2013-12-08 07:29:25 -08:00

can

can: add destructor for self generated skbs

2014-03-06 21:30:03 -08:00

ceph

libceph: fix corruption when using page_count 0 page in rbd

2014-06-07 13:25:40 -07:00

core

net-gro: reset skb->truesize in napi_reuse_skb()

2014-05-30 21:52:16 -07:00

dcb

…

dccp

net:dccp: do not report ICMP redirects to user space

2013-10-13 16:08:30 -07:00

decnet

decnet: remove duplicated include from dn_table.c

2013-04-07 17:12:01 -04:00

dns_resolver

…

dsa

dsa: fix freeing of sparse port allocation

2013-03-25 12:23:41 -04:00

ethernet

net: add ETH_P_802_3_MIN

2013-03-28 01:20:42 -04:00

ieee802154

6lowpan: fix lockdep splats

2014-03-06 21:30:02 -08:00

ipv4

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

2014-06-17 15:52:27 +08:00

ipv6

Merge remote-tracking branch 'lsk/linux-linaro-lsk-android' into linux-linaro-lsk-android

2014-06-12 12:30:54 +01:00

ipx

net: rework recvmsg handler msg_name and msg_namelen logic

2013-12-08 07:29:25 -08:00

irda

net: rework recvmsg handler msg_name and msg_namelen logic

2013-12-08 07:29:25 -08:00

iucv

net: rework recvmsg handler msg_name and msg_namelen logic

2013-12-08 07:29:25 -08:00

key

net: rework recvmsg handler msg_name and msg_namelen logic

2013-12-08 07:29:25 -08:00

l2tp

l2tp: take PMTU from tunnel UDP socket

2014-05-30 21:52:14 -07:00

lapb

…

llc

net: llc: fix use after free in llc_ui_recvmsg

2014-01-15 15:28:50 -08:00

mac80211

mac80211: fix on-channel remain-on-channel

2014-06-07 13:25:31 -07:00

mac802154

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

2013-04-30 03:55:20 -04:00

netfilter

Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android

2014-06-19 11:42:18 +01:00

netlabel

netlabel: improve domain mapping validation

2013-05-19 14:49:55 -07:00

netlink

net: rework recvmsg handler msg_name and msg_namelen logic

2013-12-08 07:29:25 -08:00

netrom

net: rework recvmsg handler msg_name and msg_namelen logic

2013-12-08 07:29:25 -08:00

nfc

net: rework recvmsg handler msg_name and msg_namelen logic

2013-12-08 07:29:25 -08:00

openvswitch

openvswitch: Remove unneeded ovs_netdev_get_ifindex()

2013-04-30 00:19:11 -04:00

packet

net: Fix ns_capable check in sock_diag_put_filterinfo

2014-05-30 21:52:15 -07:00

phonet

inet: prevent leakage of uninitialized memory to user in recv syscalls

2013-12-08 07:29:25 -08:00

rds

rds: prevent dereference of a NULL device in rds_iw_laddr_check

2014-04-14 06:42:18 -07:00

rfkill

rfkill: Introduce CONFIG_RFKILL_PM and use instead of CONFIG_PM to power down

2013-07-01 13:40:27 -07:00

rose

net: rose: restore old recvmsg behavior

2014-01-15 15:28:49 -08:00

rxrpc

net: rework recvmsg handler msg_name and msg_namelen logic

2013-12-08 07:29:25 -08:00

sched

net_sched: htb: fix a typo in htb_change_class()

2013-10-13 16:08:29 -07:00

sctp

sctp: reset flowi4_oif parameter on route lookup

2014-05-30 21:52:16 -07:00

sunrpc

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

2014-05-07 09:50:19 +01:00

tipc

net: rework recvmsg handler msg_name and msg_namelen logic

2013-12-08 07:29:25 -08:00

unix

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

2014-04-15 09:59:04 +08:00

vmw_vsock

net: rework recvmsg handler msg_name and msg_namelen logic

2013-12-08 07:29:25 -08:00

wimax

…

wireless

Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android

2014-06-19 11:42:18 +01:00

x25

net: rework recvmsg handler msg_name and msg_namelen logic

2013-12-08 07:29:25 -08:00

xfrm

xfrm: force a garbage collection after deleting a policy

2013-05-31 17:30:07 -07:00

activity_stats.c

net: activity_stats: Stop using obsolete create_proc_read_entry api

2013-07-01 15:52:02 -07:00

compat.c

x86, x32: Correct invalid use of user timespec in the kernel

2014-02-06 11:08:12 -08:00

Kconfig

config: Set PARANOID_NETWORK and NET_ACTIVITY_STATS as default ANDROID

2013-10-17 19:43:13 -07:00

Makefile

net: activity_stats: Add statistics for network transmission activity

2013-07-01 13:40:29 -07:00

nonet.c

…

socket.c

net: socket: error on a negative msg_namelen

2014-04-14 06:42:16 -07:00

sysctl_net.c

net: Update the sysctl permissions handler to test effective uid/gid

2013-10-13 16:08:34 -07:00