Merge branch 'android-3.18' of https://android.googlesource.com/kernel/common

* android-3.18: (560 commits)
  nf: IDLETIMER: Fix broken uid field in the msg
  UPSTREAM: staging: android: Assign bool to true
  UPSTREAM: Staging: android: ion: fix typos in comments
  UPSTREAM: staging: android: ion: Replace "the the " with "the"
  usb: gadget: Do not disconnect unregistered dev
  ipv4: Missing sk_nulls_node_init() in ping_unhash().
  arm64: fix ftrace due to bad cherry-picks from mainline v3.19
  SELinux: ss: Fix policy write for ioctl operations
  nf: IDLETIMER: Adds the uid field in the msg
  arm64: ptrace: add NT_ARM_SYSTEM_CALL regset
  android: configs: Enable SELinux and its dependencies.
  arm64: add seccomp support
  arm64: add SIGSYS siginfo for compat task
  arm64: add seccomp syscall for compat task
  asm-generic: add generic seccomp.h for secure computing mode 1
  arm64: ptrace: allow tracer to skip a system call
  arm64: entry: avoid writing lr explicitly for constructing return paths
  Revert "arm64: ptrace: add PTRACE_SET_SYSCALL"
  Revert "arm64: ptrace: allow tracer to skip a system call"
  Revert "asm-generic: add generic seccomp.h for secure computing mode 1"
  ...

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

Conflicts:
	arch/arm64/include/asm/cpufeature.h
	arch/arm64/kernel/cpuinfo.c
	arch/arm64/kernel/setup.c
	drivers/clk/clk.c