From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Mon, 8 Jan 2007 23:07:31 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.20-rc5~39
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=86302f417561fec802f88fdfc343265689d4a596;p=powerpc.git

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

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] PNX8550: Fix system timer support
  [MIPS] TX49: Fix use of CDEX build_store_reg()
  [MIPS] pnx8550: Fix write_config_byte() PCI config space accessor
  [MIPS] Fix build errors on SEAD
  [MIPS] SMTC build fix
  [MIPS] csum_partial and copy in parallel
  [MIPS] Malta: Add missing MTD file.
---

86302f417561fec802f88fdfc343265689d4a596