Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

diff --cc Documentation/powerpc/booting-without-of.txt
Simple merge

diff --cc arch/powerpc/boot/wrapper
index ece6f49638dad8c486c19d1c819f1ba55c153541,5ae48f474dfa133c40d4fd67f91ac0f23d5539f2..31147a0377283e179b473aa4fa4c9f720ce8ed48
--- 1/arch/powerpc/boot/wrapper
--- 2/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
@@@ -281,25 -290,13 +289,15 @@@ ps3
  
      rm -f "$object/otheros.bld"
  
-     msg=$(dd if="$ofile.bin" of="$ofile.bin" conv=notrunc \
-         skip=$overlay_dest seek=$system_reset_kernel      \
-         count=$overlay_size bs=1 2>&1)
 +    ${CROSS}objcopy -O binary "$ofile" "$ofile.bin"
 +
+     dd if="$ofile.bin" of="$ofile.bin" conv=notrunc   \
+         skip=$overlay_dest seek=$system_reset_kernel  \
+         count=$overlay_size bs=1
  
-     if [ $? -ne "0" ]; then
-        echo $msg
-        exit 1
-     fi
- 
-     msg=$(dd if="$ofile.bin" of="$ofile.bin" conv=notrunc \
-         skip=$system_reset_overlay seek=$overlay_dest     \
-         count=$overlay_size bs=1 2>&1)
- 
-     if [ $? -ne "0" ]; then
-        echo $msg
-        exit 2
-     fi
+     dd if="$ofile.bin" of="$ofile.bin" conv=notrunc   \
+         skip=$system_reset_overlay seek=$overlay_dest \
+         count=$overlay_size bs=1
  
      gzip --force -9 --stdout "$ofile.bin" > "$object/otheros.bld"
      ;;