Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-android

* linux-linaro-lsk-v3.18: (237 commits)
  Linux 3.18.19
  x86/xen: allow privcmd hypercalls to be preempted
  rtnl: restore notifications for deleted interfaces
  Input: synaptics - add min/max quirk for Lenovo S540
  Revert "Input: synaptics - add min/max quirk for Lenovo S540"
  Revert "nfs: take extra reference to fl->fl_file when running a LOCKU operation"
  fs/ufs: restore s_lock mutex_init()
  ufs: Fix possible deadlock when looking up directories
  ufs: Fix warning from unlock_new_inode()
  vfs: Ignore unlocked mounts in fs_fully_visible
  KVM: x86: properly restore LVT0
  KVM: s390: virtio-ccw: don't overwrite config space values
  selinux: fix setting of security labels on NFS
  usb: gadget: f_fs: add extra check before unregister_gadget_item
  perf/x86: Honor the architectural performance monitoring version
  perf: Fix ring_buffer_attach() RCU sync, again
  x86/boot: Fix overflow warning with 32-bit binutils
  vfs: Remove incorrect debugging WARN in prepend_path
  KVM: x86: make vapics_in_nmi_mode atomic
  arm: KVM: force execution of HCPTR access on VM exit
  ...

Conflicts:
	security/selinux/hooks.c

Resolution summary:

  Conflict between upstream LTS commit f0f61c29dfb0 (selinux: fix
  setting of security labels on NFS) and android-3.18 commit 96f8
  bcf4a398 (pstore: selinux: add security in-core xattr support for
  pstore and debugfs.)  Resolution: simple combination.

1 files changed, 1 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index c36706086af0..5c3bb1849120 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 VERSION = 3
 PATCHLEVEL = 18
-SUBLEVEL = 17
+SUBLEVEL = 19
 EXTRAVERSION =
 NAME = Shuffling Zombie Juror