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-05-11 13:59:23 -05:00
2014-11-28 15:08:06 +01:00
2015-09-21 16:31:15 +02:00
2014-09-17 10:56:06 -07:00
2014-07-06 16:52:05 -07:00
2015-01-27 15:11:51 -08:00
2015-05-20 23:09:51 +02:00
2015-07-14 15:06:19 +08:00
2015-01-21 15:49:38 +00:00
2014-09-25 17:31:53 +02:00
2015-03-27 11:31:02 -05:00
2015-01-21 15:49:40 +00:00
2015-05-15 21:49:27 +02:00
2014-11-17 10:29:58 +09:00
2014-06-24 17:37:35 +08:00
2014-05-26 04:05:00 +09:00
2014-07-19 04:32:12 +09:00
2014-11-20 12:25:37 +01:00
2014-02-14 10:30:39 +09:00
2015-01-20 19:42:56 +08:00
2014-03-22 01:06:58 +01:00
2014-04-30 13:40:27 +08:00
2015-07-22 09:37:58 +02:00