From: Olof Johansson Date: Sun, 10 Feb 2013 00:41:46 +0000 (-0800) Subject: Merge tag 'at91-cleanup' of git://github.com/at91linux/linux-at91 into next/cleanup X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2aecd7dd2b269989aca99a4f2717504a89a2565c;p=linux-beck.git Merge tag 'at91-cleanup' of git://github.com/at91linux/linux-at91 into next/cleanup From Nicolas Ferre: Little AT91 cleanup: only remove one deprecated board. * tag 'at91-cleanup' of git://github.com/at91linux/linux-at91: ARM: at91: remove NEOCORE 926 board Signed-off-by: Olof Johansson Modify/remove conflict in arch/arm/mach-at91/board-neocore926.c --- 2aecd7dd2b269989aca99a4f2717504a89a2565c