next branch update

[Sean MacLennan]

What ever happened to this patch?

diff --git b/arch/powerpc/platforms/44x/warp.c
a/arch/powerpc/platforms/44x/warp.c index c511880..7f3c1c7 100644
--- b/arch/powerpc/platforms/44x/warp.c
+++ a/arch/powerpc/platforms/44x/warp.c
@@ -43,7 +43,13 @@ static int __init warp_probe(void)
 {
 	unsigned long root = of_get_flat_dt_root();
 
-	return of_flat_dt_is_compatible(root, "pika,warp");
+	if (!of_flat_dt_is_compatible(root, "pika,warp"))
+		return 0;
+
+	/* For __dma_alloc_coherent */
+	ISA_DMA_THRESHOLD = ~0L;
+
+	return 1;
 }
 
I don't see it in patchworks and I don't see it in Ben's or Josh's tree.

Cheers,
   Sean