korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-18 09:44:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
a7fadac10f
linux/arch/arm
History
Arnd Bergmann a7fadac10f Merge branch 'depends/rmk/devel-stable' into next/board 
The exynos4 updates conflict with code from the arm devel-stable branch
and new boards need to set atag_offset in place of boot_param.

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-exynos4/include/mach/entry-macro.S
	arch/arm/mach-exynos4/mach-smdkc210.c
	arch/arm/mach-exynos4/mach-smdkv310.c
	arch/arm/mach-exynos4/mct.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2011-11-01 00:11:41 +01:00
..
boot Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
common Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
configs Merge branch 'imx/board' into next/board 2011-10-20 15:18:11 +02:00
include/asm Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
kernel Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
lib arm: remove "optimized" SHA1 routines 2011-08-07 14:07:03 -07:00
mach-at91 Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-bcmring ARM: mach-bcmring: remove mach/memory.h 2011-10-13 12:49:48 -04:00
mach-clps711x ARM: add an extra temp register to the low level debugging addruart macro 2011-09-26 10:11:25 -04:00
mach-cns3xxx Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into devel-stable 2011-10-18 13:40:54 +01:00
mach-davinci Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-dove Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-ebsa110 ARM: add an extra temp register to the low level debugging addruart macro 2011-09-26 10:11:25 -04:00
mach-ep93xx Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-exynos4 Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-footbridge Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into devel-stable 2011-10-18 13:40:54 +01:00
mach-gemini Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-h720x ARM: mach-h720x: remove mach/memory.h 2011-10-13 12:49:45 -04:00
mach-imx Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-integrator Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-iop13xx ARM: add an extra temp register to the low level debugging addruart macro 2011-09-26 10:11:25 -04:00
mach-iop32x ARM: mach-iop32x: remove mach/memory.h 2011-10-13 12:49:32 -04:00
mach-iop33x ARM: mach-iop33x: remove mach/memory.h 2011-09-26 10:12:04 -04:00
mach-ixp4xx Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-ixp23xx ARM: add an extra temp register to the low level debugging addruart macro 2011-09-26 10:11:25 -04:00
mach-ixp2000 Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-kirkwood Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-ks8695 Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01: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 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-mmp Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-msm Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-mv78xx0 Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-mx5 ARM: mach-mx5: convert boot_params to atag_offset 2011-08-21 17:15:01 -04:00
mach-mxs Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-netx ARM: mach-netx: remove mach/memory.h 2011-10-13 12:49:35 -04:00
mach-nomadik Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-nuc93x ARM: mach-nuc93x: remove mach/memory.h 2011-10-13 12:49:40 -04:00
mach-omap1 Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-omap2 Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-orion5x Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-pnx4008 Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-prima2 Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into devel-stable 2011-10-18 13:40:54 +01:00
mach-pxa Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-realview Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-rpc ARM: add an extra temp register to the low level debugging addruart macro 2011-09-26 10:11:25 -04:00
mach-s3c64xx Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-s3c2410 Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-s3c2412 ARM: mach-s3c24*: convert boot_params to atag_offset 2011-08-21 17:15:09 -04:00
mach-s3c2416 ARM: mach-s3c24*: convert boot_params to atag_offset 2011-08-21 17:15:09 -04:00
mach-s3c2440 ARM: mach-s3c24*: convert boot_params to atag_offset 2011-08-21 17:15:09 -04:00
mach-s3c2443 Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-s5p64x0 Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-s5pc100 Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-s5pv210 Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-sa1100 Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-shark ARM: add an extra temp register to the low level debugging addruart macro 2011-09-26 10:11:25 -04:00
mach-shmobile Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-spear3xx ARM: spear: remove mach/memory.h and plat/memory.h 2011-10-13 12:49:38 -04:00
mach-spear6xx ARM: spear: remove mach/memory.h and plat/memory.h 2011-10-13 12:49:38 -04:00
mach-tcc8k ARM: mach-tcc8k: convert boot_params to atag_offset 2011-08-21 17:15:15 -04:00
mach-tegra Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-u300 Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-ux500 Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-versatile Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-vexpress Merge branch 'ppi-irq-core-for-rmk' of git://github.com/mzyngier/arm-platforms into devel-stable 2011-10-23 14:42:30 +01:00
mach-vt8500 Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-w90x900 Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
mach-zynq ARM: mach-zynq: remove mach/memory.h 2011-10-13 12:49:49 -04:00
mm Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
nwfpe
oprofile Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2011-02-15 10:18:48 -08:00
plat-iop ARM: convert PCI defines to variables 2011-07-12 11:19:29 -05:00
plat-mxc Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
plat-nomadik ARM: 7056/1: plat-nomadik: kill off <plat/gpio.h> 2011-08-23 15:30:04 +01:00
plat-omap Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
plat-orion ARM: 7063/1: Orion: gpio: add missing include of linux/types.h 2011-08-24 08:29:20 +01:00
plat-pxa ARM: 7104/1: plat-pxa: break out GPIO driver specifics 2011-10-01 23:45:34 +01:00
plat-s3c24xx ARM: SAMSUNG: Add support for handling of cpu revision 2011-08-24 19:25:19 +09:00
plat-s5p Merge branch 'ep93xx/board' into next/board 2011-10-17 11:22:50 +00:00
plat-samsung ARM: EXYNOS4: Add support new EXYNOS4412 SoC 2011-10-04 18:35:01 +09:00
plat-spear Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
plat-tcc ARM: plat-tcc: remove mach/memory.h 2011-10-13 12:49:42 -04:00
plat-versatile ARM: consolidate SMP cross call implementation 2011-05-23 16:53:17 +01:00
tools ARM: 7051/1: cpuimx* boards: fix mach-types errors 2011-08-22 15:57:22 +01:00
vfp ARM: vfp: Fix the comment to make it consistent with the code. 2011-09-23 12:05:30 +05:30
Kconfig Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
Kconfig-nommu Fix common misspellings 2011-03-31 11:26:23 -03:00
Kconfig.debug ARM: kprobes: Add config option for selecting the ARM kprobes tests 2011-09-20 18:17:42 +00:00
Makefile ARM: 7012/1: Set proper TEXT_OFFSET for newer MSMs 2011-08-13 11:26:18 +01:00