Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit ae336b3a authored by Amit Pundir's avatar Amit Pundir
Browse files

Merge tag 'v4.13-rc2'



Linux 4.13-rc2

Conflicts:
    drivers/android/binder.c
        Pick changes from upstream commit c4ea41ba ("binder:
        use group leader instead of open thread") instead of
        AOSP Change-Id: Id693f74b3591f3524a8c6e9508e70f3e5a80c588
        ("ANDROID: binder: use group leader instead of open thread").
    include/linux/mount.h
        Trivial merge conflict due to upstream commit 3859a271
        ("randstruct: Mark various structs for randomization").

Signed-off-by: default avatarAmit Pundir <amit.pundir@linaro.org>
parents a9373167 520eccdf
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment