linux-uconsole/include/uapi
Amit Pundir ecfe0b5f15 Merge branch 'android-3.10' of https://android.googlesource.com/kernel/common into linaro-android-3.10-lsk
* android-3.10: (60 commits)
  kbuild: make it possible to specify the module output dir
  xt_qtaguid: Use sk_callback_lock read locks before reading sk->sk_socket
  ipv6: clean up anycast when an interface is destroyed
  usb: gadget: check for accessory device before disconnecting HIDs
  staging: android: ashmem: add missing include
  usb: gadget: android: Save/restore ep0 completion function
  selinux: Remove obsolete selinux_audit_data initialization.
  selinux: make the netif cache namespace aware
  selinux: correctly label /proc inodes in use before the policy is loaded
  selinux: fix inode security list corruption
  selinux: put the mmap() DAC controls before the MAC controls
  selinux: reduce the number of calls to synchronize_net() when flushing caches
  [PATCH 5/5] pstore: selinux: add security in-core xattr support for pstore and debugfs
  SELinux: Update policy version to support constraints info
  [PATCH v4 4/5] pstore: add pmsg
  [PATCH 3/5] pstore: handle zero-sized prz in series
  [PATCH v2 2/5] pstore: remove superfluous memory size check
  [PATCH v4 1/5] pstore: use snprintf
  pstore: clarify clearing of _read_cnt in ramoops_context
  prctl: make PR_SET_TIMERSLACK_PID pid namespace aware
  ...

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

Conflicts:
	drivers/staging/android/Kconfig
2015-02-12 16:39:41 +08:00
..
asm-generic seccomp: add "seccomp" syscall 2014-10-07 16:42:32 -07:00
drm drm: Kill user_modes list and the associated ioctls 2013-04-30 10:03:07 +10:00
linux Merge branch 'android-3.10' of https://android.googlesource.com/kernel/common into linaro-android-3.10-lsk 2015-02-12 16:39:41 +08:00
mtd
rdma IB/uverbs: Implement memory windows support in uverbs 2013-02-21 11:59:09 -08:00
scsi FCoE Updates for 3.9 2013-03-01 09:10:08 +00:00
sound ALSA: compress: add num_sample_rates in snd_codec_desc 2014-11-06 16:41:48 -08:00
video video: adf: ensure consistent alignment on userspace facing structs 2014-03-27 10:20:42 -07:00
xen
Kbuild