AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-02 23:16:49 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
a5f17d1f4c
linux_dsm_epyc7002/arch/arm/mach-sa1100/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
..
assabet.h Nicolas Pitre has a new email address 2009-09-15 09:37:12 -07:00
badge4.h [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
bitfield.h [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
cerf.h [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
collie.h [ARM] sa1100: remove unreferenced IRQ definitions 2010-03-02 07:40:49 +08:00
debug-macro.S ARM: add an extra temp register to the low level debugging addruart macro 2011-09-26 10:11:25 -04:00
dma.h [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
entry-macro.S [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
gpio.h GPIO: sa1100: implement proper gpiolib gpio_to_irq conversion 2012-01-13 22:25:23 -07:00
h3xxx.h ARM: 5821/1: SA1100: h3100/h3600: revise copyright boilerplates 2009-12-06 16:52:56 +00:00
hardware.h ARM: convert PCI defines to variables 2011-07-12 11:19:29 -05:00
io.h ARM: io: remove IO_SPACE_LIMIT from SA11x0 2011-08-17 08:44:17 +01:00
irqs.h [ARM] pxa: replacing dead SHARPSL_LOCOMO with SHARP_LOCOMO 2010-08-05 14:32:29 +08:00
jornada720.h [ARM] 5255/1: Update jornada ssp to remove build errors/warnings 2008-09-18 12:29:09 +01:00
lart.h [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
mcp.h Revert "ARM: sa11x0: Implement autoloading of codec and codec pdata for mcp bus." 2012-01-20 17:38:58 +00:00
memory.h ARM: mach-sa1100: move ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size 2011-07-18 15:30:03 -04:00
mtd-xip.h [ARM] move asm/xip.h's mach/hardware.h include to mach/xip.h 2008-12-14 13:22:51 +00:00
nanoengine.h ARM: 6459/2: sa1100: Add nanoEngine PCI support. 2010-12-21 14:53:46 +00:00
neponset.h Nicolas Pitre has a new email address 2009-09-15 09:37:12 -07:00
reset.h Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 2008-08-07 11:06:47 +01:00
SA-1100.h Fix common misspellings 2011-03-31 11:26:23 -03:00
SA-1101.h [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
SA-1111.h [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
shannon.h [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
simpad.h ARM: 7024/1: simpad: Cleanup CS3 accessors. 2011-10-17 09:12:42 +01:00
timex.h [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
uncompress.h Nicolas Pitre has a new email address 2009-09-15 09:37:12 -07:00