| commit | ffba0bcddf3329d5d411552230267147efc6ffc3 | [log] [tgz] |
|---|---|---|
| author | Alex Shi <alex.shi@linaro.org> | Fri Dec 02 11:27:24 2016 +0800 |
| committer | Alex Shi <alex.shi@linaro.org> | Fri Dec 02 11:27:24 2016 +0800 |
| tree | 08149d70a3cb3792bf615d27f3f98b93d7fa810d | |
| parent | 4450e96693acc193205906318b0f6e6e6eca4e64 [diff] | |
| parent | 2e67ba554184199114a948786e47decb8b9a469b [diff] |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-android
Conflicts:
skip stable commit 27c872851 u_ether: don't starve tx request queue
in drivers/usb/gadget/function/u_ether.c, since it isn't fit in android