From: Huang, Tao <huangtao@rock-chips.com>
Date: Wed, 11 Nov 2015 11:52:00 +0000 (+0800)
Subject: Merge branch 'torvalds/master'
X-Git-Tag: firefly_0821_release~3605
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bbf44583ace773a2e157339b0ce72f7d146685e9;p=firefly-linux-kernel-4.4.55.git

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

bbf44583ace773a2e157339b0ce72f7d146685e9