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
..
2015-03-06 09:12:56 -08:00
2015-08-05 03:58:27 -07:00
2014-09-05 10:32:06 +02:00
2015-05-14 10:02:31 +01:00
2015-07-14 04:15:11 -07:00
2015-03-18 02:02:14 +01:00
2015-05-19 11:11:34 +02:00
2013-08-06 23:48:50 +02:00
2015-01-19 11:47:35 -08:00
2014-07-11 14:40:41 +02:00
2013-12-16 14:09:20 -07:00
2015-04-08 17:00:18 +02:00
2015-07-17 21:56:14 +02:00
2015-11-11 15:12:54 +08:00
2014-07-24 11:19:55 +08:00
2014-07-04 18:28:08 +08:00
2014-03-13 15:24:12 +08:00
2014-05-22 15:11:52 +08:00
2015-11-11 15:12:54 +08:00
2015-01-21 09:58:57 +01:00