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

..

acpi

rk: revert to v3.10

2015-11-11 15:57:28 +08:00

asm-generic

Merge branch 'torvalds/master'

2015-11-11 19:52:00 +08:00

clocksource

rk: revert to v3.10

2015-11-11 15:57:28 +08:00

crypto

rk: revert to v3.10

2015-11-11 15:57:28 +08:00

drm

Merge branch 'torvalds/master'

2015-11-11 19:52:00 +08:00

dt-bindings

Merge branch 'torvalds/master'

2015-11-11 19:52:00 +08:00

keys

KEYS: Merge the type-specific data with the payload data

2015-10-21 15:18:36 +01:00

kvm

rk: revert to v3.10

2015-11-11 15:57:28 +08:00

linux

Merge branch 'torvalds/master'

2015-11-11 19:52:00 +08:00

math-emu

…

media

Merge branch 'torvalds/master'

2015-11-11 19:52:00 +08:00

memory

…

misc

cxl: Allow the kernel to trust that an image won't change on PERST.

2015-08-14 21:32:07 +10:00

net

rk: revert to v3.10

2015-11-11 15:57:28 +08:00

pcmcia

…

ras

tracing: add trace event for memory-failure

2015-06-24 17:49:43 -07:00

rdma

IB/core, cma: Make __attribute_const__ declarations sparse-friendly

2015-10-30 17:57:49 -04:00

rxrpc

…

scsi

rk: revert to v3.10

2015-11-11 15:57:28 +08:00

soc

Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2015-11-10 15:00:03 -08:00

sound

rk: revert to v3.10

2015-11-11 15:57:28 +08:00

target

rk: revert to v3.10

2015-11-11 15:57:28 +08:00

trace

Merge branch 'torvalds/master'

2015-11-11 19:52:00 +08:00

uapi

Merge branch 'torvalds/master'

2015-11-11 19:52:00 +08:00

video

rk: revert to v3.10

2015-11-11 15:57:28 +08:00

xen

rk: revert to v3.10

2015-11-11 15:57:28 +08:00

Kbuild

…