黄涛 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

..

appletalk

appletalk: remove "config IPDDP_DECAP"

2013-03-22 10:21:09 -04:00

arcnet

arcnet: cleanup sizeof parameter

2013-08-11 18:35:25 -07:00

bonding

bonding: 802.3ad: make aggregator_identifier bond-private

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

caif

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

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

can

can: flexcan: flexcan_open(): fix error path if flexcan_chip_start() fails

2014-03-23 21:38:19 -07:00

cris

ethtool: fix drvinfo strings set in drivers

2013-01-06 21:06:31 -08:00

dsa

DSA: Convert spaces to tabs where appropriate

2013-01-10 00:04:34 -08:00

ethernet

Merge tag 'lsk-android-14.04' into develop-3.10

2014-04-24 19:04:10 +08:00

fddi

drivers:net: dma_alloc_coherent: use __GFP_ZERO instead of memset(, 0)

2013-03-17 12:50:24 -04:00

hamradio

hamradio/yam: fix info leak in ioctl

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

hippi

rrunner.c: fix possible memory leak in rr_init_one()

2013-03-10 16:42:23 -04:00

hyperv

netvsc: don't flush peers notifying work during setting mtu

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

ieee802154

at86rf230: change irq handling to prevent lockups with edge type irq

2013-04-16 16:34:08 -04:00

irda

Merge remote-tracking branch 'origin/upstream/linux-linaro-lsk-v3.10-android+android-common-3.10' into develop-3.10

2013-11-11 14:38:40 +08:00

phy

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

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

plip

net: add ETH_P_802_3_MIN

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

ppp

Merge tag 'v3.10.23' into develop-3.10

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

slip

tty: Added a CONFIG_TTY option to allow removal of TTY

2013-01-18 16:15:27 -08:00

team

team: fix master carrier set when user linkup is enabled

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

usb

Merge tag 'lsk-android-14.04' into develop-3.10

2014-04-24 19:04:10 +08:00

vmxnet3

vmxnet3: fix building without CONFIG_PCI_MSI

2014-03-23 21:38:18 -07:00

wan

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

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

wimax

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

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

wireless

Merge tag 'lsk-android-14.04' into develop-3.10

2014-04-24 19:04:10 +08:00

xen-netback

xen-netback: remove pointless clause from if statement

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

dummy.c

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

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

eql.c

…

ifb.c

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

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

Kconfig

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

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

LICENSE.SRC

…

loopback.c

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

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

macvlan.c

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

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

macvtap.c

macvtap: signal truncated packets

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

Makefile

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

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

mdio.c

…

mii.c

…

netconsole.c

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

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

ntb_netdev.c

ntb_netdev: remove from list on exit

2013-05-15 10:58:14 -07:00

rionet.c

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

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

sb1000.c

…

Space.c

drivers/net: delete old x86 variant of the seeq8005 driver

2013-01-22 10:39:56 -05:00

sungem_phy.c

Fix misspellings of "whether" in comments.

2012-11-19 14:31:35 +01:00

tun.c

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

2014-01-16 09:17:42 +08:00

veth.c

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

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

virtio_net.c

virtio-net: alloc big buffers also when guest can receive UFO

2014-03-23 21:38:10 -07:00

vxlan.c

vxlan: fix potential NULL dereference in arp_reduce()

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

xen-netfront.c

xen-netfront: fix resource leak in netfront

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