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