system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-29 16:00:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
linux/arch/arm
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
..
boot Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 2012-01-16 14:34:54 -08:00
common ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP 2012-01-23 10:20:05 +00:00
configs Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. 2012-01-23 14:50:30 -08:00
include/asm Linux 3.3-rc2 2012-02-07 15:05:20 -08:00
kernel Linux 3.3-rc2 2012-02-07 15:05:20 -08:00
lib ARM: 7301/1: Rename the T() macro to TUSER() to avoid namespace conflicts 2012-01-25 11:07:40 +00:00
mach-at91 Linux 3.3-rc2 2012-02-07 15:05:20 -08:00
mach-bcmring Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-clps711x ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-cns3xxx ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-davinci ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-dove ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-ebsa110 ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-ep93xx Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-exynos Linux 3.3-rc2 2012-02-07 15:05:20 -08:00
mach-footbridge ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-gemini ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-h720x ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-highbank Linux 3.3-rc2 2012-02-07 15:05:20 -08:00
mach-imx Linux 3.3-rc2 2012-02-07 15:05:20 -08:00
mach-integrator Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-iop13xx ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-iop32x ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-iop33x ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-ixp4xx ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-ixp23xx ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-ixp2000 ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-kirkwood ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-ks8695 ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-l7200/include/mach ARM: add an extra temp register to the low level debugging addruart macro 2011-09-26 10:11:25 -04:00
mach-lpc32xx Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-mmp ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-msm Linux 3.3-rc2 2012-02-07 15:05:20 -08:00
mach-mv78xx0 ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-mxs Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-netx Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-nomadik Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-omap1 ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-omap2 Linux 3.3-rc2 2012-02-07 15:05:20 -08:00
mach-orion5x ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-picoxcell ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-pnx4008 ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-prima2 ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-pxa Linux 3.3-rc2 2012-02-07 15:05:20 -08:00
mach-realview Linux 3.3-rc2 2012-02-07 15:05:20 -08:00
mach-rpc ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-s3c64xx ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-s3c2410 ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-s3c2412 ARM: s3c24xx: move special idle code to out of line 2012-01-20 18:55:13 -05:00
mach-s3c2416 ARM: s3c24xx: move special idle code to out of line 2012-01-20 18:55:13 -05:00
mach-s3c2440 Board-level changes 2012-01-09 14:37:41 -08:00
mach-s3c2443 Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 2012-01-07 12:03:30 -08:00
mach-s5p64x0 Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-s5pc100 Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-s5pv210 Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-sa1100 Linux 3.3-rc2 2012-02-07 15:05:20 -08:00
mach-shark ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-shmobile Linux 3.3-rc2 2012-02-07 15:05:20 -08:00
mach-spear3xx Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-spear6xx Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-tegra ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-u300 Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-ux500 Linux 3.3-rc2 2012-02-07 15:05:20 -08:00
mach-versatile Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-vexpress Linux 3.3-rc2 2012-02-07 15:05:20 -08:00
mach-vt8500 ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-w90x900 ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-zynq ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mm ARM: 7304/1: ioremap: fix boundary check when reusing static mapping 2012-01-27 21:26:38 +00:00
nwfpe ARM: 7207/1: Use generic ARM instruction set condition code checks for nwfpe. 2011-12-13 08:52:02 +00:00
oprofile oprofile, arm/sh: Fix oprofile_arch_exit() linkage issue 2011-12-23 11:58:34 +01:00
plat-iop Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci 2012-01-11 18:50:26 -08:00
plat-mxc Linux 3.3-rc2 2012-02-07 15:05:20 -08:00
plat-nomadik Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-01-17 18:40:24 -08:00
plat-omap ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
plat-orion New feature development 2012-01-09 14:38:51 -08:00
plat-pxa Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/drivers 2011-11-23 20:47:41 +00:00
plat-s3c24xx ARM: s3c24xx: move special idle code to out of line 2012-01-20 18:55:13 -05:00
plat-s5p Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 2012-01-07 12:03:30 -08:00
plat-samsung ARM: fixes for ARM platforms 2012-01-17 18:55:56 -08:00
plat-spear ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
plat-versatile ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP 2012-01-23 10:20:05 +00:00
tools ARM: Update mach-types 2011-12-23 22:58:10 +00:00
vfp arm: remove several unnecessary module.h include instances 2011-10-31 19:30:48 -04:00
Kconfig ARM: 7291/1: cache: assume 64-byte L1 cachelines for ARMv7 CPUs 2012-01-23 10:20:05 +00:00
Kconfig-nommu
Kconfig.debug ARM: debug: arrange Kconfig options more logically 2012-01-20 10:50:46 +00:00
Makefile Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. 2012-01-23 14:50:30 -08:00