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

..

configs

Hexagon: Comet platform support

2011-11-01 07:34:21 -07:00

include

Merge branch 'torvalds/master'

2015-11-11 19:52:00 +08:00

kernel

Merge branch 'akpm' (patches from Andrew)

2015-09-10 18:19:42 -07:00

lib

Hexagon: Copyright marking changes

2012-10-18 17:07:21 -05:00

mm

rk: revert to v3.10

2015-11-11 15:57:28 +08:00

Kconfig

ktime: Kill non-scalar ktime_t implementation for 2038

2014-07-23 10:16:50 -07:00

Makefile

Hexagon: change arch version config to allow comparisons

2013-04-30 19:40:22 -05:00