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
..
asm-generic	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
drm	Merge branch 'torvalds/master'	2015-11-11 19:52:00 +08:00
linux	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
misc	cxl: Add alternate MMIO error handling	2015-08-18 19:34:43 +10:00
mtd	mtd: mtd-user: remove stdint.h include	2015-10-19 18:19:06 -07:00
rdma	Initial 4.4 merge window submission	2015-11-07 13:33:07 -08:00
scsi	cxlflash: Virtual LUN support	2015-08-26 18:05:39 -07:00
sound	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
video	rk: revert to v3.10	2015-11-11 15:57:28 +08:00
xen	xen/gntdev: use types from linux/types.h in userspace headers	2015-10-23 14:20:45 +01:00
Kbuild