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

..

sti

reset: sti: constify of_device_id array

2015-08-03 13:13:50 +02:00

core.c

…

Kconfig

…

Makefile

rk: temp revert rk change

2015-11-11 15:54:30 +08:00

reset-ath79.c

reset: ath79: Fix missing spin_lock_init

2015-09-01 14:48:40 +02:00

reset-berlin.c

…

reset-lpc18xx.c

reset: add driver for lpc18xx rgu

2015-08-03 13:13:51 +02:00

reset-rockchip.c

…

reset-socfpga.c

reset: socfpga: Update reset-socfpga to read the altr,modrst-offset property

2015-08-03 13:13:59 +02:00

reset-sunxi.c

…

reset-zynq.c

reset: reset-zynq: Adding support for Xilinx Zynq reset controller.

2015-08-04 17:07:46 +02:00