Merge branch 'pan-3.18' of https://git.linaro.org/people/david.brown/linux-lsk...

Merge branch 'pan-3.18' of https://git.linaro.org/people/david.brown/linux-lsk into linux-linaro-lsk-v3.18

* 'pan-3.18' of https://git.linaro.org/people/david.brown/linux-lsk: (27 commits)
  arm64: kernel: Add support for Privileged Access Never
  arm64: Generalise msr_s/mrs_s operations
  arm64: kernel: Add cpufeature 'enable' callback
  arm64: kernel: Add cpuid_feature_extract_field() for 4bit sign extension
  arm64: kernel: Add min_field_value and use '>=' for feature detection
  arm64: kernel: Add optional CONFIG_ parameter to ALTERNATIVE()
  arm64: alternative: Provide if/else/endif assembler macros
  arm64: alternative: Work around .inst assembler bugs
  arm64: alternative: Merge alternative-asm.h into alternative.h
  arm64: Add AArch32 instruction set condition code checks
  arm64: lib: use pair accessors for copy_*_user routines
  arm64/uaccess: fix sparse errors
  arm64: kernel: Move config_sctlr_el1
  arm64: Emulate SETEND for AArch32 tasks
  arm64: kconfig: move emulation option under kernel features
  arm64: Consolidate hotplug notifier for instruction emulation
  arm64: fix return code check when changing emulation handler
  arm64: Trace emulation of AArch32 legacy instructions
  arm64: Emulate CP15 Barrier instructions
  arm64: Port SWP/SWPB emulation support from arm
  ...

Conflicts:
	arch/arm64/kernel/Makefile