github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-09 23:23:53 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
2a762e702c
linux/arch/frv
History
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
include Merge branch 'torvalds/master' 2015-11-11 19:52:00 +08:00
kernel frv: Rewrite atomic implementation 2015-07-27 14:06:23 +02:00
lib frv: Rewrite atomic implementation 2015-07-27 14:06:23 +02:00
mb93090-mb00 PCI: Revert "PCI: Call pci_read_bridge_bases() from core instead of arch code" 2015-09-15 13:18:04 -05:00
mm rk: revert to v3.10 2015-11-11 15:57:28 +08:00
defconfig
Kconfig
Kconfig.debug
Makefile