linux-uconsole/include/uapi
Amit Pundir 839f249169 Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Conflicts due to AOSP's backported commits:
    fs/f2fs/crypto.c
    fs/f2fs/crypto_fname.c
        Deleted by AOSP commit c1286ff41c2f ("f2fs: backport from (4c1fad64 -
        Merge tag 'for-f2fs-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs)")

    fs/f2fs/crypto_key.c
    fs/f2fs/data.c
    fs/f2fs/file.c
        AOSP commit 13f002354db1 ("f2fs: catch up to v4.14-rc1")
        override most of stable 4.4.y changes.

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2017-11-20 20:53:19 +05:30
..
asm-generic mm: mlock: add mlock flags to enable VM_LOCKONFAULT usage 2015-11-05 19:34:48 -08:00
drm drm_fourcc: Fix DRM_FORMAT_MOD_LINEAR #define 2017-10-08 10:14:15 +02:00
linux Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android 2017-11-20 20:53:19 +05:30
misc
mtd mtd: mtd-user: remove stdint.h include 2015-10-19 18:19:06 -07:00
rdma Initial 4.4 merge window submission 2015-11-07 13:33:07 -08:00
scsi cxlflash: Fix to avoid virtual LUN failover failure 2016-09-15 08:27:49 +02:00
sound ASoC: Updates for v4.4 2015-10-26 12:14:49 +01:00
video video: adf: ensure consistent alignment on userspace facing structs 2016-02-16 13:53:19 -08:00
xen xen/gntdev: use types from linux/types.h in userspace headers 2015-10-23 14:20:45 +01:00
Kbuild