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] Fix wreckage after removal of tickadj; convert to GENERIC_TIME.
  [MIPS] DECstation defconfig update
  [MIPS] Fix size of zones_size and zholes_size array
  [MIPS] BCM1480: Mask pending interrupts against c0_status.im.
  [MIPS] SB1250: Interrupt handler fixes
  [MIPS] Remove IT8172-based platforms, ITE 8172G and Globespan IVR support.
  [MIPS] Remove Atlas and SEAD from feature-removal-schedule.
  [MIPS] Remove Jaguar and Ocelot family from feature list.
  [MIPS] BCM1250: TRDY timeout tweaks for Broadcom SiByte systems
  [MIPS] Remove dead DECstation boot code
  [MIPS] Let gcc align 'struct pt_regs' on 8 bytes boundary

1 files changed, 0 insertions, 36 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index b98f01fc14bf..2e410f5aa750 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -211,42 +211,6 @@ Who:	Nick Piggin <npiggin@suse.de>
 
 ---------------------------
 
-What:   Support for the Momentum / PMC-Sierra Jaguar ATX evaluation board
-When:   September 2006
-Why:    Does no longer build since quite some time, and was never popular,
-        due to the platform being replaced by successor models.  Apparently
-        no user base left.  It also is one of the last users of
-        WANT_PAGE_VIRTUAL.
-Who:    Ralf Baechle <ralf@linux-mips.org>
-
----------------------------
-
-What:   Support for the Momentum Ocelot, Ocelot 3, Ocelot C and Ocelot G
-When:   September 2006
-Why:    Some do no longer build and apparently there is no user base left
-        for these platforms.
-Who:    Ralf Baechle <ralf@linux-mips.org>
-
----------------------------
-
-What:   Support for MIPS Technologies' Altas and SEAD evaluation board
-When:   September 2006
-Why:    Some do no longer build and apparently there is no user base left
-        for these platforms.  Hardware out of production since several years.
-Who:    Ralf Baechle <ralf@linux-mips.org>
-
----------------------------
-
-What:   Support for the IT8172-based platforms, ITE 8172G and Globespan IVR
-When:   September 2006
-Why:    Code does no longer build since at least 2.6.0,  apparently there is
-        no user base left for these platforms.  Hardware out of production
-        since several years and hardly a trace of the manufacturer left on
-        the net.
-Who:    Ralf Baechle <ralf@linux-mips.org>
-
----------------------------
-
 What:   Interrupt only SA_* flags
 When:   Januar 2007
 Why:    The interrupt related SA_* flags are replaced by IRQF_* to move them