linux-uconsole/arch/alpha
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
..
boot alpha: Fix bootpfile and bootpzfile make targets 2015-05-26 10:01:50 -07:00
include Merge branch 'torvalds/master' 2015-11-11 19:52:00 +08:00
kernel rk: revert to v3.10 2015-11-11 15:57:28 +08:00
lib alpha: lib: export __delay 2015-09-17 21:16:07 -07:00
math-emu
mm rk: revert to v3.10 2015-11-11 15:57:28 +08:00
oprofile alpha: delete non-required instances of <linux/init.h> 2015-05-26 10:01:48 -07:00
defconfig
Kconfig alpha: select CONFIG_ARCH_USE_CMPXCHG_LOCKREF. 2015-08-30 18:01:16 -07:00
Kconfig.debug
Makefile