Merge branch 'misc' into devel

Conflicts:
	arch/arm/Kconfig

diff --cc arch/arm/Kconfig
index 38bf684448e72b41295c662ef617fb02e9acea97,f871f2e1dd7c96f96ea6102daaebef4397f6c3cb..1fd3f280b5840407e2f5052403dd3fba13590b5c
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1176,6 -1162,6 +1174,17 @@@ config ARM_ERRATA_72078
          tables. The workaround changes the TLB flushing routines to invalidate
          entries regardless of the ASID.
  
++config PL310_ERRATA_727915
++      bool "Background Clean & Invalidate by Way operation can cause data corruption"
++      depends on CACHE_L2X0
++      help
++        PL310 implements the Clean & Invalidate by Way L2 cache maintenance
++        operation (offset 0x7FC). This operation runs in background so that
++        PL310 can handle normal accesses while it is in progress. Under very
++        rare circumstances, due to this erratum, write data can be lost when
++        PL310 treats a cacheable write transaction during a Clean &
++        Invalidate by Way operation.
++
  config ARM_ERRATA_743622
        bool "ARM errata: Faulty hazard checking in the Store Buffer may lead to data corruption"
        depends on CPU_V7

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/boot/compressed/Makefile
Simple merge

diff --cc arch/arm/include/asm/processor.h
Simple merge

diff --cc arch/arm/kernel/head.S
Simple merge

diff --cc arch/arm/kernel/module.c
Simple merge

diff --cc arch/arm/kernel/ptrace.c
Simple merge

diff --cc arch/arm/kernel/setup.c
Simple merge

diff --cc arch/arm/kernel/signal.c
Simple merge

diff --cc arch/arm/mm/Kconfig
Simple merge

diff --cc arch/arm/mm/cache-l2x0.c
Simple merge