diff options
| author |   Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-02-03 12:32:26 +0100 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-02-03 12:32:26 +0100 |
| commit | 57225b76864210d667b935c54babf22b6c31336b (patch) | |
| tree | cce7eab28de00a88d75b8eda704f5838e10947b1 /arch/arm/mach-at91/include/mach/at91cap9_matrix.h | |
| parent | Linux 3.3-rc2 (diff) | |
| parent | Merge branch 'amba' into for-armsoc (diff) | |
| download | linux-dev-57225b76864210d667b935c54babf22b6c31336b.tar.xz linux-dev-57225b76864210d667b935c54babf22b6c31336b.zip | |
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
Diffstat (limited to 'arch/arm/mach-at91/include/mach/at91cap9_matrix.h')
0 files changed, 0 insertions, 0 deletions