tree 3c8388217251e9d408b0cd93d3dd0620eb77962e
parent 096e5bdaf166791e128ed3b9190542412559333b
parent 236d333c3c05c179e31f461285c09271256a1381
author Linus Torvalds <torvalds@g5.osdl.org> 1162491277 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1162491277 -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] Do not use -msym32 option for modules.
  [MIPS] Don't use R10000 llsc workaround version for all llsc-full processors.
  [MIPS] Ocelot G: Fix : "CURRENTLY_UNUSED" is not defined warning.
  [MIPS] Fix warning about init_initrd() call if !CONFIG_BLK_DEV_INITRD.
  [MIPS] IP27: Allow SMP ;-)  Another changeset messed up by patch.
  [MIPS] Fix merge screwup by patch(1)
  Revert "[MIPS] Make SPARSEMEM selectable on QEMU."