Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
commite45521a8d44da2c4efd17fc8e853f7917e99b57a
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 22 Jan 2007 17:07:00 +0000 (22 09:07 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 22 Jan 2007 17:07:00 +0000 (22 09:07 -0800)
tree71c95c906588e182b82a1ef45ca8dad3fc1a29f6
parent79d26287021d3158e3cb8da820f1b8233564dd3b
parent2806ccd7ad9073f4f1a065b5672d7592e7838e97
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Delete duplicate call to load_irq_save.
  [MIPS] SMTC: Fix cp0 hazard.