diff --git a/[refs] b/[refs]
index 1fafa5659f23..9d363c62d66c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef017bebd01c1b4e075d649eee0c8c1c79f9ceb9
+refs/heads/master: 6525ee55bbfd35bf3aff8c59562d6a3d8559a4f0
diff --git a/trunk/arch/parisc/Makefile b/trunk/arch/parisc/Makefile
index 5ddad7bd60ac..0d428278356d 100644
--- a/trunk/arch/parisc/Makefile
+++ b/trunk/arch/parisc/Makefile
@@ -77,7 +77,7 @@ libs-y	+= arch/parisc/lib/ `$(CC) -print-libgcc-file-name`
 
 drivers-$(CONFIG_OPROFILE)		+= arch/parisc/oprofile/
 
-PALO := $(shell if which palo; then : ; \
+PALO := $(shell if (which palo 2>&1); then : ; \
 	elif [ -x /sbin/palo ]; then echo /sbin/palo; \
 	fi)