From: Olof Johansson Date: Tue, 7 Feb 2012 23:06:59 +0000 (-0800) Subject: Merge branch 'at91-3.4-base' of git://github.com/at91linux/linux-at91 into next/cleanup X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8f9993f76aacfc58083fad04f8e1b6bbea33de23;p=linux-beck.git Merge branch 'at91-3.4-base' of git://github.com/at91linux/linux-at91 into next/cleanup * 'at91-3.4-base' of git://github.com/at91linux/linux-at91: ARM: at91: code removal of CAP9 SoC Conflicts: arch/arm/mach-at91/at91cap9.c --- 8f9993f76aacfc58083fad04f8e1b6bbea33de23