projects / firefly-linux-kernel-4.4.55.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bccb225 2156eda)
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@kernel.org>
Sat, 10 Jan 2015 11:54:47 +0000 (11:54 +0000)
committerMark Brown <broonie@kernel.org>
Sat, 10 Jan 2015 11:54:47 +0000 (11:54 +0000)
Conflicts:
arch/arm/include/asm/hardware/coresight.h
arch/arm/kernel/etm.c

1  2 
arch/arm/Kconfig.debug patch | diff1 | diff2 | blob | history
drivers/Makefile patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig.debug
Simple merge
diff --cc drivers/Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.