Huang, Tao bbf44583ac Merge branch 'torvalds/master' ... Signed-off-by: Huang, Tao <huangtao@rock-chips.com> Conflicts: arch/arm/include/asm/arm-cci.h drivers/android/binder.c drivers/android/binder_trace.h drivers/block/zram/Kconfig drivers/net/wireless/rockchip_wlan/esp8089/esp_premalloc/version.h include/kvm/arm_arch_timer.h include/linux/pl320-ipc.h include/linux/zsmalloc.h include/uapi/linux/android/binder.h		2015-11-11 19:52:00 +08:00
..
6lowpan	6lowpan: put mcast compression in an own function	2015-10-21 00:49:25 +02:00
9p	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
802
8021q	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
appletalk	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
atm	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
ax25	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
batman-adv	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
bluetooth	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
bridge	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
caif	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
can	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
ceph	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
core	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
dcb	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
dccp	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
decnet	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
dns_resolver	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
dsa	net: dsa: use switchdev obj for VLAN add/del ops	2015-11-01 15:56:11 -05:00
ethernet	net: help compiler generate better code in eth_get_headlen	2015-09-28 22:51:15 -07:00
hsr	net: hsr: convert to using IFF_NO_QUEUE	2015-08-18 11:55:07 -07:00
ieee802154	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
ipv4	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
ipv6	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
ipx	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
irda	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
iucv	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
key	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
l2tp	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
l3mdev	net: Add netif_is_l3_slave	2015-10-07 04:27:43 -07:00
lapb
llc	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
mac80211	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
mac802154	mac802154: llsec: use kzfree	2015-10-21 00:49:24 +02:00
mpls	mpls: reduce memory usage of routes	2015-10-27 19:52:59 -07:00
netfilter	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
netlabel
netlink	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
netrom	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
nfc	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
openvswitch	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
packet	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
phonet	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
rds	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
rfkill	Merge branch 'torvalds/master'	2015-11-11 19:52:00 +08:00
rose	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
rxrpc	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
sched	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
sctp	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
sunrpc	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
switchdev	switchdev: respect SKIP_EOPNOTSUPP flag in case there is no recursion	2015-11-03 13:39:21 -05:00
tipc	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
unix	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
vmw_vsock	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
wimax	net:wimax: Fix doucble word "the the" in networking.xml	2015-08-09 22:43:52 -07:00
wireless	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
x25	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
xfrm	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
compat.c	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
Kconfig	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
Makefile	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
socket.c	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
sysctl_net.c	rk: revert to v3.10	2015-11-11 15:57:28 +08:00