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 |
||
|---|---|---|
| .. | ||
| include/mach | ||
| Kconfig | ||
| Makefile | ||
| Makefile.boot | ||
| assabet.c | ||
| badge4.c | ||
| cerf.c | ||
| clock.c | ||
| collie.c | ||
| cpu-sa1100.c | ||
| cpu-sa1110.c | ||
| dma.c | ||
| generic.c | ||
| generic.h | ||
| h3xxx.c | ||
| h3100.c | ||
| h3600.c | ||
| hackkit.c | ||
| irq.c | ||
| jornada720.c | ||
| jornada720_ssp.c | ||
| lart.c | ||
| leds-assabet.c | ||
| leds-badge4.c | ||
| leds-cerf.c | ||
| leds-hackkit.c | ||
| leds-lart.c | ||
| leds.c | ||
| leds.h | ||
| nanoengine.c | ||
| neponset.c | ||
| pci-nanoengine.c | ||
| pleb.c | ||
| pm.c | ||
| shannon.c | ||
| simpad.c | ||
| sleep.S | ||
| ssp.c | ||
| time.c | ||