Programming Languages Research Group: Git - firefly-linux-kernel-4.4.55.git/commit - arch/sh/include/asm/tlb.h

projects / firefly-linux-kernel-4.4.55.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: bbba26b 312ccd6)

author	Mark Brown <broonie@kernel.org>
	Fri, 9 Jan 2015 18:22:45 +0000 (18:22 +0000)
committer	Mark Brown <broonie@kernel.org>
	Fri, 9 Jan 2015 18:22:45 +0000 (18:22 +0000)
commit	2156eda2aafa0b0f660656246a11d7c2a9947ff9
tree	81c2fadeadc2f62e3a03c5fe78b41087d2926233	tree \| snapshot
parent	bbba26b2fc88c77239ebcd45d7fb669018511dfe	commit \| diff
parent	312ccd6ab1510724d298ae6c19177e501d6c1ca0	commit \| diff

Merge remote-tracking branch 'lsk/v3.10/topic/coresight' into linux-linaro-lsk

Conflicts:
arch/arm/include/asm/hardware/coresight.h
drivers/Makefile
drivers/of/base.c

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/hw_breakpoint.c	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/of/base.c	diff1 \|	diff2 \|	blob \| history
include/linux/bitops.h	diff1 \|	diff2 \|	blob \| history
include/linux/device.h	diff1 \|	diff2 \|	blob \| history
mm/backing-dev.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.