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
This commit is contained in:
Olof Johansson 2012-02-07 15:06:59 -08:00
commit 8f9993f76a
26 changed files with 17 additions and 2597 deletions