Merge branch 'linaro-android-3.18-lsk' of...

Merge branch 'linaro-android-3.18-lsk' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-v3.18-android

* 'linaro-android-3.18-lsk' of git://android.git.linaro.org/kernel/linaro-android:
  HACK: usb: gadget: fix android composite driver build
  net: ipv6: fix virtual tunneling build
  net: core: fix Null ptr dereference in UID-based routing
  xt_qtaguid: check xt_sock socket before releasing

 Conflicts:
	arch/arm64/include/asm/cpufeature.h
	arch/arm64/kernel/cpuinfo.c
	drivers/clk/clk.c