projects / firefly-linux-kernel-4.4.55.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5cfb02d 52e9a33)
Merge branch 'torvalds/master'
authorHuang, Tao <huangtao@rock-chips.com>
Wed, 11 Nov 2015 11:52:00 +0000 (19:52 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Wed, 11 Nov 2015 11:52:00 +0000 (19:52 +0800)
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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.