| commit | 684852315dea655f788f6f1006a14b8ab86478fd | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Tue Feb 07 15:11:31 2012 -0800 |
| committer | Olof Johansson <olof@lixom.net> | Tue Feb 07 15:11:31 2012 -0800 |
| tree | 90d7885b26b87d27ed4cdb4026e608908e8a8a4c | |
| parent | a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 [diff] | |
| parent | 9918ceafd4a9e013572e03983f528017c29bb1cb [diff] |
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