From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 Jul 2008 18:37:19 +0000 (-0700)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.26-rc9~64
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=97055a915720fe1aff9ac71c17fae60e929d4ed6;p=linux-2.6-omap-h63xx.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] cevt-txx9: Reset timer counter on initialization
  [MIPS] IP22: Fix crashes due to wrong L1_CACHE_BYTES
  [MIPS] IP32: Fix unexpected irq 71
---

97055a915720fe1aff9ac71c17fae60e929d4ed6