tree 058a5961548d489fdaffdbcfb7b34893946d37cf
parent 15a4cb9c25df05a5d4844e80a1aea83d66165868
parent 0004a9dfeaa709a7f853487aba19932c9b1a87c8
author Linus Torvalds <torvalds@woody.osdl.org> 1165289014 -0800
committer Linus Torvalds <torvalds@woody.osdl.org> 1165289014 -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] Cleanup memory barriers for weakly ordered systems.
  [MIPS] Alchemy: Automatically enable CONFIG_RESOURCES_64BIT for PCI configs.
  [MIPS] Unify csum_partial.S
  [MIPS] SWARM: Fix a typo in #error directives
  [MIPS] Fix atomic.h build errors.
  [MIPS] Use SYSVIPC_COMPAT to fix various problems on N32
  [MIPS] klconfig add missing bracket