projects / firefly-linux-kernel-4.4.55.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4cb518a 76e8de4)
Merge remote-tracking branch 'lsk/v3.10/topic/android-fixes' into linux-linaro-lsk...
authorMark Brown <broonie@linaro.org>
Thu, 14 Nov 2013 15:43:52 +0000 (15:43 +0000)
committerMark Brown <broonie@linaro.org>
Thu, 14 Nov 2013 15:43:52 +0000 (15:43 +0000)
commitf3401c581ccf80d60107699c012da3f820f88b9e
tree82ee3d8d33b52f71bd90e2fdee0a22df2ed581fctree | snapshot
parent4cb518ab3d962ac6d0249f47a512127364ddf7dacommit | diff
parent76e8de404a34bfff318da0b31e752db2642511f3commit | diff
Merge remote-tracking branch 'lsk/v3.10/topic/android-fixes' into linux-linaro-lsk-android

The cpufreq_interactive changes have been merged upstream and the local
version dropped.

Conflicts:
drivers/cpufreq/cpufreq_interactive.c
drivers/cpufreq/cpufreq_interactive.c diff1 | diff2 | blob | history
drivers/video/Kconfig diff1 | diff2 | blob | history
drivers/video/Makefile diff1 | diff2 | blob | history
fs/proc/task_mmu.c diff1 | diff2 | blob | history
include/linux/mm_types.h diff1 | diff2 | blob | history
mm/mempolicy.c diff1 | diff2 | blob | history
mm/mmap.c diff1 | diff2 | blob | history
mm/mprotect.c diff1 | diff2 | blob | history
mm/page_alloc.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.