ent 9918ceafd4a9e013572e03983f528017c29bb1cb
author Olof Johansson <olof@lixom.net> 1328656291 -0800
committer Olof Johansson <olof@lixom.net> 1328656291 -0800

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