tree 7fb35e3ba6a54f64316aeb0f4b4fc9947b1c0691
parent 74bda9310fe9776f3d940057ac2e7881214577d6
parent 2dbda7dceca81adfe57c8884be5c66e70822d89a
author Linus Torvalds <torvalds@woody.osdl.org> 1168297651 -0800
committer Linus Torvalds <torvalds@woody.osdl.org> 1168297651 -0800

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] 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.