q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/arch/arm/mach-at91/include/mach
History
Olof Johansson a5f17d1f4c Linux 3.3-rc2 
.. 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
2012-02-07 15:05:20 -08:00
..
at91_adc.h
at91_aic.h ARM: at91: make aic soc independent 2011-11-28 22:50:39 +08:00
at91_dbgu.h ARM: at91: make DBGU soc independent 2011-11-28 22:50:39 +08:00
at91_pio.h
at91_pit.h ARM: at91: make pit register base soc independent 2011-11-28 22:50:38 +08:00
at91_pmc.h ARM: 5850/1: [AT91] AT572D940HF processor support 2010-01-20 12:34:06 +00:00
at91_rstc.h ARM: at91: make rstc soc independent 2012-01-20 17:22:38 +01:00
at91_rtc.h ARM: at91: make rm9200 rtc drivers soc independent 2011-11-28 22:50:39 +08:00
at91_rtt.h [ARM] 5265/3: [AT91] Add copyright info 2008-09-21 23:01:18 +01:00
at91_shdwc.h ARM: at91: make shutdown controler soc independent 2011-11-28 22:50:38 +08:00
at91_spi.h
at91_ssc.h
at91_st.h
at91_tc.h
at91_twi.h
at91cap9.h ARM: at91: make rstc soc independent 2012-01-20 17:22:38 +01:00
at91cap9_matrix.h
at91rm9200.h ARM: at91: make rm9200 rtc drivers soc independent 2011-11-28 22:50:39 +08:00
at91rm9200_emac.h
at91rm9200_mc.h
at91sam9_ddrsdr.h ARM: at91: merge at91cap9_ddrsdr.h in at91sam9_ddrsdr.h 2012-01-20 17:20:23 +01:00
at91sam9_sdramc.h ARM: 6185/1: AT91: PM: dual ram controller support 2010-07-09 12:31:50 +01:00
at91sam9_smc.h ARM: at91: make smc register base soc independent 2011-11-28 22:50:38 +08:00
at91sam9g45.h ARM: at91: make rstc soc independent 2012-01-20 17:22:38 +01:00
at91sam9g45_matrix.h [ARM] 5571/1: at91: Basic support for at91sam9g45 series: header files. 2009-06-27 11:05:21 +01:00
at91sam9rl.h ARM: at91: make rstc soc independent 2012-01-20 17:22:38 +01:00
at91sam9rl_matrix.h
at91sam9260.h ARM: at91: make rstc soc independent 2012-01-20 17:22:38 +01:00
at91sam9260_matrix.h [ARM] 5265/3: [AT91] Add copyright info 2008-09-21 23:01:18 +01:00
at91sam9261.h ARM: at91: make rstc soc independent 2012-01-20 17:22:38 +01:00
at91sam9261_matrix.h [ARM] 5265/3: [AT91] Add copyright info 2008-09-21 23:01:18 +01:00
at91sam9263.h ARM: at91: make rstc soc independent 2012-01-20 17:22:38 +01:00
at91sam9263_matrix.h
at91x40.h ARM: at91: make aic soc independent 2011-11-28 22:50:39 +08:00
at_hdmac.h dmaengine: at_hdmac: add DMA slave transfers 2009-07-22 23:15:33 -07:00
atmel-mci.h atmel-mci: change use of dma slave interface 2009-12-15 08:53:35 -08:00
board.h ARM/USB: at91/ohci-at91: rename vbus_pin_inverted to vbus_pin_active_low 2012-01-20 15:51:14 +01:00
cpu.h at91: use structure to store the current soc 2011-07-28 15:07:28 +00:00
debug-macro.S ARM: at91: make DBGU soc independent 2011-11-28 22:50:39 +08:00
entry-macro.S ARM: at91: make aic soc independent 2011-11-28 22:50:39 +08:00
gpio.h ARM: at91/gpio: drop PIN_BASE 2011-11-29 15:46:18 +00:00
gsia18s.h AT91: Support for gsia18s board 2011-01-14 19:49:04 +01:00
hardware.h ARM: at91: make aic soc independent 2011-11-28 22:50:39 +08:00
io.h ARM: mach-at91: remove arch specific special handling for ioremap 2011-11-15 22:30:39 -05:00
irqs.h ARM: at91: make aic soc independent 2011-11-28 22:50:39 +08:00
memory.h at91: drop boot_params and PLAT_PHYS_OFFSET 2011-05-25 23:04:35 +08:00
stamp9g20.h at91: fix map_io init usage 2011-05-25 23:04:34 +08:00
system_rev.h ARM: at91: fix NAND bus width decoding from system_rev 2011-11-28 12:10:34 +01:00
timex.h ARM: at91: define CLOCK_TICK_RATE to bogus value except A91X40 2011-11-28 22:50:37 +08:00
uncompress.h ARM: at91: make DBGU soc independent 2011-11-28 22:50:39 +08:00