From: Olof Johansson <olof@lixom.net>
Date: Tue, 7 Feb 2012 23:11:31 +0000 (-0800)
Subject: Merge branch 'at91-3.4-base' of git://github.com/at91linux/linux-at91 into at91/base
X-Git-Tag: firefly_0821_release~3680^2~3195^2~6^2^2~24
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=684852315dea655f788f6f1006a14b8ab86478fd;p=firefly-linux-kernel-4.4.55.git

Merge branch 'at91-3.4-base' of git://github.com/at91linux/linux-at91 into at91/base

* '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
---

684852315dea655f788f6f1006a14b8ab86478fd