Merge branch 'at91-3.4-base' of git://github.com/at91linux/linux-at91 into at91/base
authorOlof Johansson <olof@lixom.net>
Tue, 7 Feb 2012 23:11:31 +0000 (15:11 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 7 Feb 2012 23:11:31 +0000 (15:11 -0800)
commit684852315dea655f788f6f1006a14b8ab86478fd
tree90d7885b26b87d27ed4cdb4026e608908e8a8a4c
parenta5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13
parent9918ceafd4a9e013572e03983f528017c29bb1cb
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