黄涛 7fe47454f2 Merge tag 'lsk-android-14.04' into develop-3.10 ...

lsk-android 14.04

Conflicts:
	Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
	drivers/pinctrl/pinconf-generic.c
	include/linux/pinctrl/consumer.h
	include/linux/pinctrl/pinconf-generic.h

2014-04-24 19:04:10 +08: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: Set hard_header_len according to available acceleration

2014-04-14 06:42:18 -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 tag 'v3.10.23' into develop-3.10

2013-12-10 12:23:21 +08:00

bridge

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

2014-04-15 09:59:04 +08: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: resend all writes after the osdmap loses the full flag

2014-03-31 09:58:13 -07:00

core

netpoll: fix the skb check in pkt_is_ns

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

dcb

rk: revert 20f3d0b+v3.0.66 to v3.0

2013-11-08 21:34:05 +08:00

dccp

rk: revert 20f3d0b+v3.0.66 to v3.0

2013-11-08 21:34:05 +08:00

decnet

rk: revert 20f3d0b+v3.0.66 to v3.0

2013-11-08 21:34:05 +08:00

dns_resolver

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

2012-12-16 15:40:50 -08:00

dsa

dsa: fix freeing of sparse port allocation

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

ethernet

rk: revert 20f3d0b+v3.0.66 to v3.0

2013-11-08 21:34:05 +08:00

ieee802154

6lowpan: fix lockdep splats

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

ipv4

Merge branch 'linaro-android-3.10-lsk' of git://git.linaro.org/people/john.stultz/android into linux-linaro-lsk-android

2014-04-15 18:12:51 +01:00

ipv6

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

2014-04-15 09:59:04 +08: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

inet: fix addr_len/msg->msg_namelen assignment in recv_error and rxpmtu functions

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

lapb

net/lapb: remove depends on CONFIG_EXPERIMENTAL

2013-01-11 11:40:01 -08:00

llc

net: llc: fix use after free in llc_ui_recvmsg

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

mac80211

mac80211: clear sequence/fragment number in QoS-null frames

2014-03-23 21:38:12 -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 branch 'linux-linaro-lsk' into linux-linaro-lsk-android

2014-04-04 11:53: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

packet: fix send path when running with proto == 0

2014-01-15 15:28:46 -08: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

BT: fix a bug of rfkill-bt.c, bt_irq_wl used uninited.

2014-04-22 16:03:20 +08: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

rk: revert 20f3d0b+v3.0.66 to v3.0

2013-11-08 21:34:05 +08:00

sctp

net: sctp: fix skb leakage in COOKIE ECHO path of chunk->auth_chunk

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

sunrpc

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

2014-03-09 07:33:42 +00: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

net: cleanup unsigned to unsigned int

2012-04-15 12:44:40 -04:00

wireless

Wifi: fix wifi disconnect when suspended. add keep-power-in-suspend to sdio cap.

2014-03-31 09:47:32 +08:00

x25

net: rework recvmsg handler msg_name and msg_namelen logic

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

xfrm

rk: revert 20f3d0b+v3.0.66 to v3.0

2013-11-08 21:34:05 +08:00

activity_stats.c

rk: revert 20f3d0b+v3.0.66 to v3.0

2013-11-08 21:34:05 +08:00

compat.c

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

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

Kconfig

rk: revert 20f3d0b+v3.0.66 to v3.0

2013-11-08 21:34:05 +08:00

Makefile

rk: revert 20f3d0b+v3.0.66 to v3.0

2013-11-08 21:34:05 +08:00

nonet.c

llseek: automatically add .llseek fop

2010-10-15 15:53:27 +02:00

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