forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions
linux-uconsole/arch/cris
History
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
..
arch-v10 CRIS: Drop code related to obsolete or unused kconfigs 2015-11-02 20:03:05 +01:00
arch-v32 CRIS: Drop code related to obsolete or unused kconfigs 2015-11-02 20:03:05 +01:00
boot CRIS: Drop code related to obsolete or unused kconfigs 2015-11-02 20:03:05 +01:00
configs CRISv32: Add GPIO driver to the default configs 2015-09-05 00:33:25 +02:00
include Merge branch 'torvalds/master' 2015-11-11 19:52:00 +08:00
kernel cris: Drop reference to get_cmos_time() 2015-11-02 20:03:05 +01:00
mm rk: revert to v3.10 2015-11-11 15:57:28 +08:00
Kconfig cris: time: Cleanup of persistent clock stuff 2015-11-02 20:03:05 +01:00
Kconfig.debug
Makefile CRISv32: add device tree support 2015-03-25 09:49:48 +01:00