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

* v3.18/topic/aosp: (25 commits)
  wakeup: Add the guard condition for len in pm_get_active_wakeup_sources
  CHROMIUM: android: Unconditionally remove callbacks in sync_fence_free()
  CHROMIUM: android: fix warning when releasing active sync point
  mm: reorder can_do_mlock to fix audit denial
  staging: ion: debugfs to shrink pool
  usb: gadget: configfs: handle gadget reset request for android
  Enable adb with android-pipe in IA image
  selinux: Android kernel compatibility with M userspace
  selinux: extended permissions for ioctls
  security: add ioctl specific auditing to lsm_audit
  selinux: remove unnecessary pointer reassignment
  Revert "security: lsm_audit: add ioctl specific auditing"
  Revert "SELinux: per-command whitelisting of ioctls"
  Revert "SELinux: use deletion-safe iterator to free list"
  Revert "SELinux: ss: Fix policy write for ioctl operations"
  android: add CONFIG_DEBUG_RODATA to recommended config
  arm: mm: support ARCH_MMAP_RND_BITS.
  mm: mmap: Add new /proc tunable for mmap_base ASLR.
  Don't kill IPv4 sockets when killing IPv6 sockets was requested.
  uid_cputime: Check for the range while removing range of UIDs.
  ...

 Conflicts:
   drivers/usb/gadget/Kconfig

   Conflict due to android-3.18 merge trying to sneak in Android
   Composite Gadget "USB_G_ANDROID" changes into
   drivers/usb/gadget/Kconfig which we have already moved to
   drivers/usb/gadget/legacy/Kconfig during last restructuring.

 Resolution (as recommended by Amit Pundir)

   Delete "USB_G_ANDROID" and dependent config option and keep only
   USB_CONFIGFS_F_MIDI specific changes from AOSP commit 2ccf4f4f216f
   "usb: gadget: Remove circular dependency on Config".

0 files changed, 0 insertions, 0 deletions