Merge tag 'del-shark-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/cleanup

From Linus Walleij:

This deletes the Shark SA110-based sub-architecture from
the kernel.

* tag 'del-shark-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  video: drop code for ARCH_SHARK in cyber2000fb
  input: i8042: drop dependency on ARCH_SHARK
  ide: drop dependency on ARCH_SHARK
  block: drop dependency on ARCH_SHARK
  MAINTAINERS: delete Shark machine entry
  ARM: delete mach-shark

Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 0 insertions, 5 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index e61c2e83fc2b..b95ebade6c02 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1142,11 +1142,6 @@ F:	drivers/net/ethernet/i825xx/ether1*
 F:      drivers/net/ethernet/seeq/ether3*
 F:      drivers/scsi/arm/
 
-ARM/SHARK MACHINE SUPPORT
-M:      Alexander Schulz <alex@shark-linux.de>
-W:      http://www.shark-linux.de/shark.html
-S:      Maintained
-
 ARM/SAMSUNG ARM ARCHITECTURES
 M:      Ben Dooks <ben-linux@fluff.org>
 M:      Kukjin Kim <kgene.kim@samsung.com>