From: Olof Johansson <olof@lixom.net>
Date: Tue, 7 Feb 2012 23:19:08 +0000 (-0800)
Subject: Merge branch 'at91-3.4-base+9x5' of git://github.com/at91linux/linux-at91 into next/soc
X-Git-Tag: v3.4-rc1~89^2~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e69128b947da0a2474447868f73c76311e2baedb;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branch 'at91-3.4-base+9x5' of git://github.com/at91linux/linux-at91 into next/soc

* 'at91-3.4-base+9x5' of git://github.com/at91linux/linux-at91:
  ARM: at91/at91sam9x5: Device tree definition files
  ARM: at91/at91sam9x5: SoC basic support
  ARM: at91/at91sam9x5: Configuration and Makefile
  ARM: at91/at91sam9x5: clock management for at91sam9x5 chip family
  ARM: at91/at91sam9x5: PMC header file
  ARM: at91/at91sam9x5: overall definition
  ARM: at91: code removal of CAP9 SoC

Conflicts:
	arch/arm/mach-at91/at91cap9.c
---

e69128b947da0a2474447868f73c76311e2baedb