Update qemu/fvp/hikey on the generic driver

Change-Id: Ia6fbdc4a7c4c26de231874e20ee2c5654d6ea19a
Tested-by: Jens Wiklander <jens.wiklander@linaro.org> (FVP)
Tested-by: Pascal Brand <pascal.brand@linaro.org> (QEMU)
Tested-by: Pascal Brand <pascal.brand@linaro.org> (QEMU - with Pager)
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Signed-off-by: Pascal Brand <pascal.brand@st.com>
diff --git a/default.xml b/default.xml
index 23c8374..d5b854b 100644
--- a/default.xml
+++ b/default.xml
@@ -11,14 +11,13 @@
 	<!-- OP-TEE gits -->
 	<project path="optee_os" name="optee_os.git" />
 	<project path="optee_client" name="optee_client.git" />
-	<project path="optee_linuxdriver" name="optee_linuxdriver.git" />
 	<project path="optee_test" name="optee_test.git" />
 
 	<!-- busybox -->
 	<project remote="busybox" path="busybox" name="busybox.git" revision="dbf5a6da6a4295ce26edd1ce34fde567d19afa02" />
 
 	<!-- Linux kernel -->
-	<project remote="linux" path="linux" name="linux.git" revision="refs/tags/v4.1-rc1"/>
+	<project remote="linaro-swg" path="linux" name="linux.git" revision="optee"/>
 
 	<!-- linaro-swg gits -->
 	<project remote="linaro-swg" path="gen_rootfs" name="gen_rootfs.git" />