a5f17d1f4c
.. several days delayed. No reason, I just didn't think of it. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJPKF4KAAoJEHm+PkMAQRiGw/YH+wXg2DpZUuHeBK52zMGlJBPc DzX11/Uan3Y07gM0JbDzuVxwjX4vdxR2bV6r1qsLP8JEUnE8jyFC32DBGi5WAht7 F4KU/Uov2Ds5/wzvY4Iuo01C+JftQHXuy/Sbhck1d0LI0yjLejRaw+zuJv0x2/eS 7YqV+KTGE1lDuJs/Gyq1Vqr1g9831AuS1tv/g3gaqBuN6TcPBFCocaVxzwrUc+y6 94h26XbbOhQRIz38oqUkiqAGnvYS61ocyBcEiRHf0dXkNSDIINqlgukvd7YTXouA jj/w/DWpMRcQuYAgqkrurr9+yWC9hVQcsvvQ5sAQnIPcxoR868sg1pO8Oheq+1g= =kUzV -----END PGP SIGNATURE----- Merge tag 'v3.3-rc2' into depends/rmk/for-armsoc There were conflicts between fixes going in after 3.3-rc1 and Russell's stable arm-soc base branch. Resolving it in the dependency branch so that each topic branch shares the same resolution. Conflicts: arch/arm/mach-at91/at91cap9.c arch/arm/mach-at91/at91sam9g45.c |
||
---|---|---|
.. | ||
devices | ||
include/mach | ||
3ds_debugboard.c | ||
audmux-v1.c | ||
audmux-v2.c | ||
avic.c | ||
clock.c | ||
cpu.c | ||
cpufreq.c | ||
devices.c | ||
epit.c | ||
iomux-v1.c | ||
iomux-v3.c | ||
iram_alloc.c | ||
irq-common.c | ||
irq-common.h | ||
Kconfig | ||
Makefile | ||
pwm.c | ||
ssi-fiq-ksym.c | ||
ssi-fiq.S | ||
system.c | ||
time.c | ||
tzic.c | ||
ulpi.c |