Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@woody.osdl.org>
Wed, 10 Jan 2007 23:56:09 +0000 (15:56 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Wed, 10 Jan 2007 23:56:09 +0000 (15:56 -0800)
commit40e38d30432a749b68d4c6e2038764ed1d3c846e
tree81ac2a33bfcae387424199cc99360a0b56f5b62e
parentc70a1ce873b82f17dd99e0397227ceb578a5d57f
parent8a93c4968fc177844680987b31d00d1fc3bc02aa
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
      [MIPS] Alchemy:  Fix PCI-memory access
  [MIPS] Fix N32 SysV IPC routines
  [MIPS] PNX8550: Fix system timer initialization