iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
f6a1ba6736
linux/arch/arm/mach-realview/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
..
barriers.h ARM: 6870/1: The mandatory barrier rmb() must be a dsb() in for device accesses 2011-05-12 10:52:00 +01:00
board-eb.h ARM: 7298/1: realview: fix mapping of MPCore private memory region 2012-01-25 09:24:36 +00:00
board-pb11mp.h ARM: 7298/1: realview: fix mapping of MPCore private memory region 2012-01-25 09:24:36 +00:00
board-pb1176.h ARM: 6217/4: mach-realview: expose PB1176 ROM using physmap and map_rom 2011-10-17 09:13:41 +01:00
board-pba8.h
board-pbx.h
clkdev.h ARM: Indirect round/set_rate operations through clk structure 2010-05-02 09:35:38 +01:00
debug-macro.S Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:34:22 -07:00
entry-macro.S ARM: RealView: convert to CONFIG_MULTI_IRQ_HANDLER 2011-11-15 18:13:59 +00:00
gpio.h ARM: gpio: make trivial GPIOLIB implementation the default 2011-08-12 08:54:19 +01:00
hardware.h
io.h
irqs-eb.h
irqs-pb11mp.h
irqs-pb1176.h ARM: 7300/1: realview: fix definition of GPIO0 interrupt on PB1176 to match TRM 2012-01-25 11:01:45 +00:00
irqs-pba8.h ARM: 5890/1: Fix incorrect Realview board IRQs for L220 and PMU 2010-05-02 09:35:37 +01:00
irqs-pbx.h ARM: 5890/1: Fix incorrect Realview board IRQs for L220 and PMU 2010-05-02 09:35:37 +01:00
irqs.h
memory.h ARM: mach-realview: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size 2011-07-18 15:30:02 -04:00
platform.h ARM: Realview/Versatile/Integrator: remove unused definitions from platform.h 2010-05-02 09:35:35 +01:00
timex.h
uncompress.h