diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-12-02 11:24:06 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-12-02 11:24:06 +0800 |
| commit | 0b19a18adaea49e25bbdcec4b46efc4d1f199efa (patch) | |
| tree | 9730682ed99187f14d31341a06176d9c3ca97ce5 /lib/assoc_array.c | |
| parent | 7f61045ad5c0a055e08bb90f779914fe1b585981 (diff) | |
| parent | a5e9874fc9e05e8471bfd58cabd75a3432d38ba6 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-androidlinux-linaro-lsk-android-test
Conflicts:
drivers/android/binder.c
skip stable commit 517052446f36 u_ether: don't starve tx request queue
in drivers/usb/gadget/function/u_ether.c, since it isn't fit in android
Diffstat (limited to 'lib/assoc_array.c')
0 files changed, 0 insertions, 0 deletions