]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitceb7d991ea1983d2db0797b06fc304e89a541f00
tree90d7885b26b87d27ed4cdb4026e608908e8a8a4c
parent6a401be94757a888f44f55558249cfe37a6433d1
parentf64d4d7fb20ad448aa2f8d5d9dbfcc2819e1c8c5
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