tree 2a6bf027912ae74a354ce3b7d460d04ccfac4e55
parent 7bc703cde6592016ed3eadd8bd592ee9adbe6647
parent f409333f361fed0c71c479b2a0c4e032d496cd94
author Amit Pundir <amit.pundir@linaro.org> 1511194725 +0530
committer Amit Pundir <amit.pundir@linaro.org> 1511194725 +0530

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

Conflicts:
    net/packet/af_packet.c
        Fix conflicts by refactoring changes from LTS commit
        e4ffdf9ead59 ("packet: hold bind lock when rebinding to fanout hook"),
        to align with the changes from AOSP commit 6bec212418d2
        ("UPSTREAM: packet: fix races in fanout_add()").

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