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
..
2009-12-12 13:08:14 +01:00
2015-07-27 14:06:23 +02:00
2015-09-23 09:54:28 +02:00
2014-01-12 10:37:15 +01:00
2015-07-27 14:06:23 +02:00
2012-03-28 18:30:02 +01:00
2010-05-28 10:17:21 -07:00
2009-11-26 09:16:19 +01:00
2012-03-28 18:30:02 +01:00
2015-05-05 13:35:39 -06:00
2013-02-26 02:46:08 -05:00
2013-11-21 13:39:20 +08:00
2011-03-11 12:23:31 +01:00
2010-05-25 08:07:02 -07:00
2011-07-26 16:49:47 -07:00
2015-11-09 15:11:24 -08:00
2015-07-29 10:02:36 +02:00
2010-10-07 14:08:55 +01:00
2015-10-04 16:31:13 +01:00
2012-07-24 15:27:29 +08:00
2010-06-09 11:12:36 +02:00
2010-08-11 08:59:21 -07:00
2012-09-28 14:31:03 +09:30
2010-01-06 18:16:02 -08:00
2015-06-25 15:22:36 -07:00
2011-12-21 11:01:07 +01:00
2009-07-27 12:10:38 -07:00
2015-02-28 09:57:51 -08:00
2014-10-09 22:26:03 -04:00
2012-10-13 11:22:31 +09:00
2015-06-25 17:00:37 -07:00
2015-01-13 15:23:59 +02:00
2012-10-10 12:09:42 +01:00
2013-02-03 18:15:55 -05:00
2011-03-31 11:26:23 -03:00
2015-02-12 18:54:14 -08:00
2012-03-28 18:30:02 +01:00
2009-06-11 09:01:26 -07:00
2012-10-10 12:09:42 +01:00
2015-04-12 20:58:24 +02:00
2012-10-10 12:09:42 +01:00
2013-05-28 09:41:07 +02:00
2014-06-04 16:54:14 -07:00
2011-03-31 11:26:23 -03:00