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

Conflicts:
	drivers/android/binder.c
	skip stable commit 51705244  u_ether: don't starve tx request queue
	in drivers/usb/gadget/function/u_ether.c, since it isn't fit in android