arch/arm/mach-at91/at91cap9.c · 57225b76864210d667b935c54babf22b6c31336b · nexedi / linux · GitLab

Find file Blame History Permalink

Merge remote-tracking branch 'armsoc/depends/rmk/for-armsoc' into at91-3.4-base · 57225b76
Nicolas Ferre authored Feb 03, 2012
```
Conflicts:
	arch/arm/mach-at91/at91cap9.c
	arch/arm/mach-at91/at91sam9g45.c
```
57225b76

at91cap9.c 10.2 KB