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 |
||
|---|---|---|
| .. | ||
| ds1307.h | ||
| ds1685.h | ||
| m48t59.h | ||
| rtc-ricoh619.h | ||
| rtc-rt5036.h | ||
| sirfsoc_rtciobrg.h | ||