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
..
boot	c6x: use new common dtc rule	2012-12-03 17:17:49 -06:00
configs	C6X: add basic support for TMS320C6678 SoC	2012-07-18 23:52:31 -04:00
include	Merge branch 'torvalds/master'	2015-11-11 19:52:00 +08:00
kernel	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
lib	C6X: library code	2011-10-06 19:48:23 -04:00
mm	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
platforms	irqdomain: Use irq_domain_get_of_node() instead of direct field access	2015-10-13 19:01:23 +02:00
Kconfig	c6x: remove unused COMMON_CLKDEV Kconfig parameter	2013-10-29 23:31:46 -04:00
Makefile	c6x: Makefile: Add -D__linux__	2015-03-26 10:31:47 -04:00