From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Wed, 10 Jan 2007 23:56:09 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=40e38d30432a749b68d4c6e2038764ed1d3c846e;p=openwrt%2Fstaging%2Fblogic.git

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
---

40e38d30432a749b68d4c6e2038764ed1d3c846e