From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 1 Nov 2006 20:00:22 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: MMI-PSA29.97-13-9~45515^2~20^2~250
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=dd472546edefe0d48613c466b110533514e20455;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Fix warning in mips-boards generic PCI
  [MIPS] SMTC: Synchronize cp0 counters on bootup.
  [MIPS] SMTC: Fix crash if # of TC's > # of VPE's after pt_regs irq cleanup.
  [MIPS] 16K & 64K page size fixes
---

dd472546edefe0d48613c466b110533514e20455