From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 7 Sep 2008 02:32:21 +0000 (-0700)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.27-rc6~26
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a22a9a90cfbcc91c3e0f8dc8549535e2786d3e7e;p=~shefty%2Frdma-dev.git

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Probe initrd header only if explicitly specified
  [MIPS] TX39xx: Add missing local_flush_icache_range initialization
  [MIPS] TXx9: Fix txx9_pcode initialization
  [MIPS] Fix WARNING: at kernel/smp.c:290
  [MIPS] Fix data bus error recovery
---

a22a9a90cfbcc91c3e0f8dc8549535e2786d3e7e