Files
linux/arch/arm/include/asm
Tao Huang 640193f76b Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux-linaro-stable.git
* linux-linaro-lsk-v4.4-android: (733 commits)
  LSK-ANDROID: memcg: Remove wrong ->attach callback
  LSK-ANDROID: arm64: mm: Fix __create_pgd_mapping() call
  ANDROID: sdcardfs: Move default_normal to superblock
  blkdev: Refactoring block io latency histogram codes
  FROMLIST: arm64: kpti: Fix the interaction between ASID switching and software PAN
  FROMLIST: arm64: Move post_ttbr_update_workaround to C code
  FROMLIST: arm64: mm: Rename post_ttbr0_update_workaround
  sched: EAS: Initialize push_task as NULL to avoid direct reference on out_unlock path
  fscrypt: updates on 4.15-rc4
  ANDROID: uid_sys_stats: fix the comment
  BACKPORT: tee: indicate privileged dev in gen_caps
  BACKPORT: tee: optee: sync with new naming of interrupts
  BACKPORT: tee: tee_shm: Constify dma_buf_ops structures.
  BACKPORT: tee: optee: interruptible RPC sleep
  BACKPORT: tee: optee: add const to tee_driver_ops and tee_desc structures
  BACKPORT: tee.txt: standardize document format
  BACKPORT: tee: add forward declaration for struct device
  BACKPORT: tee: optee: fix uninitialized symbol 'parg'
  BACKPORT: tee: add ARM_SMCCC dependency
  BACKPORT: selinux: nlmsgtab: add SOCK_DESTROY to the netlink mapping tables
  ...

Conflicts:
	arch/arm64/kernel/vdso.c
	drivers/usb/host/xhci-plat.c
	include/drm/drmP.h
	include/linux/kasan.h
	kernel/time/timekeeping.c
	mm/kasan/kasan.c
	security/selinux/nlmsgtab.c

Also add this commit:
0bcdc0987c ("time: Fix ktime_get_raw() incorrect base accumulation")
2018-01-26 19:26:47 +08:00
..
2015-11-11 15:57:28 +08:00
2015-11-11 15:57:28 +08:00
2015-11-11 15:57:28 +08:00
2015-11-11 15:57:28 +08:00
2015-11-11 15:57:28 +08:00
2015-11-11 15:57:28 +08:00
2015-11-11 15:57:28 +08:00
2015-11-11 15:57:28 +08:00
2015-11-11 15:57:28 +08:00
2015-05-05 13:35:39 -06:00
2015-05-28 15:31:53 +02:00
2015-11-11 15:54:30 +08:00
2011-03-31 11:26:23 -03:00
2015-11-11 15:57:28 +08:00
2011-03-31 11:26:23 -03:00
2015-11-11 15:57:28 +08:00
2015-11-11 15:57:28 +08:00
2015-09-16 16:53:39 +02:00
2012-09-14 13:53:39 +00:00
2015-11-11 15:57:28 +08:00
2015-11-11 15:57:28 +08:00
2015-11-11 15:57:28 +08:00
2012-07-24 15:27:28 +08:00
2016-11-17 09:49:39 +08:00
2015-11-11 15:57:28 +08:00
2015-11-11 15:57:28 +08:00
2014-06-01 01:17:12 +01:00
2015-11-11 15:57:28 +08:00
2015-11-11 15:57:28 +08:00
2015-11-11 15:57:28 +08:00
2015-11-11 15:57:28 +08:00
2015-11-11 15:57:28 +08:00
2015-11-11 15:57:28 +08:00
2015-11-11 15:57:28 +08:00
2015-06-01 23:48:19 +01:00
2015-11-11 15:57:28 +08:00
2014-06-01 01:17:12 +01:00
2015-11-11 15:57:28 +08:00
2015-11-11 15:57:28 +08:00
2015-11-11 15:57:28 +08:00
2008-11-27 12:37:59 +00:00
2015-11-11 15:54:30 +08:00
2014-02-25 11:33:37 +00:00
2015-11-11 15:57:28 +08:00
2015-11-11 15:57:28 +08:00
2015-11-11 15:57:28 +08:00
2011-03-31 11:26:23 -03:00
2015-11-11 15:57:28 +08:00
2014-03-18 16:39:40 -04:00
2011-07-12 11:19:29 -05:00