Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@woody.osdl.org>
Tue, 5 Dec 2006 03:23:34 +0000 (19:23 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Tue, 5 Dec 2006 03:23:34 +0000 (19:23 -0800)
commit91f433cacc9d1ae95ae46ce26d7bcf3a724c72d0
tree058a5961548d489fdaffdbcfb7b34893946d37cf
parent15a4cb9c25df05a5d4844e80a1aea83d66165868
parent0004a9dfeaa709a7f853487aba19932c9b1a87c8
Merge branch 'upstream' of git://ftp.linux-mips.org/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