Merge branch 'gemini_fix' of git://git.berlios.de/gemini-board into devel-stable

arch/arm/mm/copypage-fa.c

@@ -40,7 +40,7 @@ fa_copy_user_page(void *kto, const void *kfrom)
 }
 
 void fa_copy_user_highpage(struct page *to, struct page *from,
-	unsigned long vaddr)
+	unsigned long vaddr, struct vm_area_struct *vma)
 {
 	void *kto, *kfrom;