Skip to content

Commit

Permalink
Merge branch 'x86-nuke-platforms-for-linus' of git://git.kernel.org/p…
Browse files Browse the repository at this point in the history
…ub/scm/linux/kernel/git/tip/tip

Pull x86 old platform removal from Peter Anvin:
 "This patchset removes support for several completely obsolete
  platforms, where the maintainers either have completely vanished or
  acked the removal.  For some of them it is questionable if there even
  exists functional specimens of the hardware"

Geert Uytterhoeven apparently thought this was a April Fool's pull request ;)

* 'x86-nuke-platforms-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, platforms: Remove NUMAQ
  x86, platforms: Remove SGI Visual Workstation
  x86, apic: Remove support for IBM Summit/EXA chipset
  x86, apic: Remove support for ia32-based Unisys ES7000
  • Loading branch information
torvalds committed Apr 2, 2014
2 parents 7125764 + b5660ba commit 467cbd2
Show file tree
Hide file tree
Showing 47 changed files with 15 additions and 8,806 deletions.
2 changes: 0 additions & 2 deletions Documentation/00-INDEX
Original file line number Diff line number Diff line change
Expand Up @@ -413,8 +413,6 @@ serial-console.txt
- how to set up Linux with a serial line console as the default.
sgi-ioc4.txt
- description of the SGI IOC4 PCI (multi function) device.
sgi-visws.txt
- short blurb on the SGI Visual Workstations.
sh/
- directory with info on porting Linux to a new architecture.
smsc_ece1099.txt
Expand Down
13 changes: 0 additions & 13 deletions Documentation/sgi-visws.txt

This file was deleted.

293 changes: 0 additions & 293 deletions Documentation/sound/oss/vwsnd

This file was deleted.

7 changes: 0 additions & 7 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -7840,13 +7840,6 @@ F: Documentation/ia64/serial.txt
F: drivers/tty/serial/ioc?_serial.c
F: include/linux/ioc?.h

SGI VISUAL WORKSTATION 320 AND 540
M: Andrey Panin <[email protected]>
L: [email protected]
W: http://linux-visws.sf.net
S: Maintained for 2.6.
F: Documentation/sgi-visws.txt

SGI XP/XPC/XPNET DRIVER
M: Cliff Whickman <[email protected]>
M: Robin Holt <[email protected]>
Expand Down
Loading

0 comments on commit 467cbd2

Please sign in to comment.