diff --git a/[refs] b/[refs]
index b70408f721d4..d36bca13e7e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 207f583d7179f707f402c36a7bda5ca1fd03ad5b
+refs/heads/master: b3cb8674811d1851bbf1486a73d62b90c119b994
diff --git a/trunk/arch/parisc/include/asm/prefetch.h b/trunk/arch/parisc/include/asm/prefetch.h
index c5edc60c059f..1ee7c82672c1 100644
--- a/trunk/arch/parisc/include/asm/prefetch.h
+++ b/trunk/arch/parisc/include/asm/prefetch.h
@@ -21,7 +21,12 @@
 #define ARCH_HAS_PREFETCH
 static inline void prefetch(const void *addr)
 {
-	__asm__("ldw 0(%0), %%r0" : : "r" (addr));
+	__asm__(
+#ifndef CONFIG_PA20
+		/* Need to avoid prefetch of NULL on PA7300LC */
+		"	extrw,u,= %0,31,32,%%r0\n"
+#endif
+		"	ldw 0(%0), %%r0" : : "r" (addr));
 }
 
 /* LDD is a PA2.0 addition. */