tree 1aa053650b49f987effcbc91184c9a4208d402b1
parent 0ca9caae2d05ee0c4878aa3e2619cd23f4ad4cb4
parent 9a244b95ddb62a17b62f4b061b6e13ca4d177942
author Linus Torvalds <torvalds@g5.osdl.org> 1160605814 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1160605814 -0700

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] Pass NULL not 0 for pointer value.
  [MIPS] IP27: Make declaration of setup_replication_mask a proper prototype.
  [MIPS] BigSur: More useful defconfig.
  [MIPS] Cleanup definitions of speed_t and tcflag_t.
  [MIPS] Fix compilation warnings in arch/mips/sibyte/bcm1480/smp.c
  [MIPS] Optimize and cleanup get_saved_sp, set_saved_sp
  [MIPS] <asm/irq.h> does not need pt_regs anymore.
  [MIPS] Workaround for bug in gcc -EB / -EL options.
  [MIPS] Fix timer setup for Jazz