tree 9730682ed99187f14d31341a06176d9c3ca97ce5
parent 7f61045ad5c0a055e08bb90f779914fe1b585981
parent a5e9874fc9e05e8471bfd58cabd75a3432d38ba6
author Alex Shi <alex.shi@linaro.org> 1480649046 +0800
committer Alex Shi <alex.shi@linaro.org> 1480649046 +0800

Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-android

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