Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

Pull ARM updates from Russell King:
 "First ARM push of this merge window, post me coming back from holiday.
  This is what has been in linux-next for the last few weeks.  Not much
  to say which isn't described by the commit summaries."

* 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
  ARM: 7463/1: topology: Update cpu_power according to DT information
  ARM: 7462/1: topology: factorize the update of sibling masks
  ARM: 7461/1: topology: Add arch_scale_freq_power function
  ARM: 7455/1: audit: move syscall auditing until after ptrace SIGTRAP handling
  ARM: 7454/1: entry: don't bother with syscall tracing on ret_from_fork path
  ARM: 7453/1: audit: only allow syscall auditing for pure EABI userspace
  ARM: 7452/1: delay: allow timer-based delay implementation to be selected
  ARM: 7451/1: arch timer: implement read_current_timer and get_cycles
  ARM: 7450/1: dcache: select DCACHE_WORD_ACCESS for little-endian ARMv6+ CPUs
  ARM: 7448/1: perf: remove arm_perf_pmu_ids global enumeration
  ARM: 7447/1: rwlocks: remove unused branch labels from trylock routines
  ARM: 7446/1: spinlock: use ticket algorithm for ARMv6+ locking implementation
  ARM: 7444/1: kernel: add arch-timer C3STOP feature
  ARM: 7460/1: remove asm/locks.h
  ARM: 7439/1: head.S: simplify initial page table mapping
  ARM: 7436/1: Do not map the vectors page as write-through on UP systems
  ...

commit cea8f46c36c3f82860b038aa23a46e16757666ba 2 parents c1e7179a38 + 91b006def3
torvalds authored in a day

Conflicts:

	arch/arm/Kconfig
	arch/arm/include/asm/word-at-a-time.h

+ git cherry-pick + git mergetool
RESTORE!!! TRAPS and TOPOLOGY!(for now, lets leave the cpu code alone)
+ kernel_diff update.
+ ARM: rwlocks: remove unused branch labels from trylock routines -> https://github.com/faux123/tuna/commit/8bca59ef3d297d68f2612086d26d209b1d1a8ee1
+ ARM: spinlock: use ticket algorithm for ARMv6+ locking implementation -> https://github.com/faux123/tuna/commit/4abd0d8ac0418ab5c79e49bfb45b8677131ddd27
+ ARM: Add optimised swahb32() byteswap helper for v6 and above -> https://github.com/DerTeufel/samsung-kernel-aries/commit/0c2628ae0104876e024775a11ec3a9a513910580
+ ...
+ lib: strncpy_from_user & strnlen_user
-> https://github.com/faux123/tuna/commit/2fb6cccc9fe41bbce04c3bd796dc40768fa2761e
-> https://github.com/faux123/tuna/commit/cc107ec0127d685b4641509293d5bf18c490cb51
-> https://github.com/faux123/tuna/commit/08a87874f10ca874cae08cb0ba8943eb4c5ca923
-> https://github.com/faux123/tuna/commit/96b570368112d422f4e864fef79f727aad8ad328
-> https://github.com/faux123/tuna/commit/8b1ab9edfc006a7cfbf882c9d3d8996e6920032b

Conflicts:

	arch/arm/Kconfig
	arch/arm/include/asm/word-at-a-time.h

+ git cherry-pick & git mergetool
+ ...
+ cacheflush: return error to userspace when flushing syscall fails -> https://github.com/torvalds/linux/commit/c5102f5935503ebebad46e137d0eef68f272cc16
+ restore: arch/arm/kernel/process.c
+ scripts/Kbuild.include: Fix portability problem of "echo -e" -> https://github.com/android/kernel_common/commit/a1bc297a906963d7a19f98de051fea7409245ba0
+ testing: PM / Sleep: Print name of wakeup source that aborts suspend -> https://github.com/android/kernel_common/commit/20a29931ecb3bd9b291b42a6ef62a412d2b3746e
+ testing: ARM: fiq_debugger: add process context reboot command -> https://github.com/android/kernel_common/commit/bdd87753ea80c74defc40fca4ef1590cd6b31fd2
+ ...
ARM: SMP: use a timing out completion for cpu hotplug

Rather than open-coding the jiffy-based wait, and polling for the
secondary CPU to come online, use a completion instead.  This
removes the need to poll, instead we will be notified when the
secondary CPU has initialized.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+ restore ...
+ ARM: smp_twd: make sure timer is stopped before registering it -> https://github.com/torvalds/linux/commits/master/arch/arm/kernel/smp_twd.c
+ ARM: vmlinux.lds.S: do not hardcode cacheline size as 32 bytescache: assume 64-byte -> L1 cachelines for ARMv7 CPUs (64-byte) ;)
+ ...