| commit | 57225b76864210d667b935c54babf22b6c31336b | [log] [tgz] |
|---|---|---|
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | Fri Feb 03 12:32:26 2012 +0100 |
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | Fri Feb 03 12:32:26 2012 +0100 |
| tree | cce7eab28de00a88d75b8eda704f5838e10947b1 | |
| parent | 62aa2b537c6f5957afd98e29f96897419ed5ebab [diff] | |
| parent | dcf81c1af839b77b44404453ecae6e5ac5a75f05 [diff] |
Merge remote-tracking branch 'armsoc/depends/rmk/for-armsoc' into at91-3.4-base Conflicts: arch/arm/mach-at91/at91cap9.c arch/arm/mach-at91/at91sam9g45.c