commit a21b0696261c2865d329afa4156ce15fcdf5e772
author Linus Torvalds <torvalds@woody.linux-foundation.org> Wed Jan 24 12:31:28 2007 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Wed Jan 24 12:31:28 2007 -0800
tree 52f9ba2bfba80a954a84f14931ebf206b79bd579
parent 717d44e849219781ced028a40fcc59d3e1f49e4c
parent 66218da212bf141532d678a699f5789c78145ab1

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] Fix wrong checksum calculation on 64-bit MIPS
  [MIPS] VPE loader: Initialize lists before they're actually being used ...
  [MIPS] Fix reported amount of freed memory - it's in kB not bytes
  [MIPS] vr41xx: need one more nop with mtc0_tlbw_hazard()
  [MIPS] SMTC: Fix module build by exporting symbol
  [MIPS] SMTC: Fix TLB sizing bug for TLB of 64 >= entries
  [MIPS] Fix APM build
  [MIPS] There is no __GNUC_MAJOR__