From: Olof Johansson Date: Thu, 26 Sep 2013 04:55:46 +0000 (-0700) Subject: Merge tag 'del-shark-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v3.13-rc1~160^2~15 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ec01791d0ff7593fbca21a93167138a49bb94768;p=profile%2Fivi%2Fkernel-x86-ivi.git Merge tag 'del-shark-for-v3.13' of git://git./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 --- ec01791d0ff7593fbca21a93167138a49bb94768