FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-23 09:56:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
cfaf8fc5b5
linux/arch/arm
History
Arnd Bergmann cfaf8fc5b5 Merge branch 'depends/rmk/memory_h' into next/cleanup2 
There are lots of conflicts between the omap and exynos cleanups
and the memory.h remove series.

Conflicts:
	arch/arm/mach-exynos4/mach-smdkc210.c
	arch/arm/mach-exynos4/mach-smdkv310.c
	arch/arm/mach-imx/mach-cpuimx27.c
	arch/arm/mach-omap1/board-ams-delta.c
	arch/arm/mach-omap1/board-generic.c
	arch/arm/mach-omap1/board-h2.c
	arch/arm/mach-omap1/board-h3.c
	arch/arm/mach-omap1/board-nokia770.c
	arch/arm/mach-omap1/board-osk.c
	arch/arm/mach-omap1/board-palmte.c
	arch/arm/mach-omap1/board-palmtt.c
	arch/arm/mach-omap1/board-palmz71.c
	arch/arm/mach-omap1/board-sx1.c
	arch/arm/mach-omap1/board-voiceblue.c
	arch/arm/mach-omap1/io.c
	arch/arm/mach-omap2/board-generic.c
	arch/arm/mach-omap2/io.c
	arch/arm/plat-omap/io.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2011-11-01 04:58:59 +01:00
..
boot arm/dts: OMAP3+: Add mpu, dsp and iva nodes 2011-10-04 22:29:40 +02:00
common Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 2011-07-29 23:35:05 -07:00
configs Merge branch 'next-samsung-board-v3.1' into next/topic-exynos4-devel-origen 2011-10-03 08:42:01 +09:00
include/asm Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
kernel Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
lib arm: remove "optimized" SHA1 routines 2011-08-07 14:07:03 -07:00
mach-at91 Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +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 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-davinci Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-dove Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +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/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-exynos4 Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-footbridge Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-gemini ARM: mach-gemini: remove mach/memory.h 2011-10-13 12:49:37 -04:00
mach-h720x ARM: mach-h720x: remove mach/memory.h 2011-10-13 12:49:45 -04:00
mach-imx Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-integrator Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +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 ARM: mach-ixp4xx: remove mach/memory.h 2011-10-13 12:49:46 -04: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 ARM: add an extra temp register to the low level debugging addruart macro 2011-09-26 10:11:25 -04:00
mach-kirkwood ARM: mach-kirkwood: remove mach/memory.h 2011-09-26 10:12:00 -04:00
mach-ks8695 ARM: add an extra temp register to the low level debugging addruart macro 2011-09-26 10:11:25 -04: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 ARM: mach-lpc32xx: remove mach/memory.h 2011-10-13 12:49:36 -04:00
mach-mmp ARM: mach-mmp: remove mach/memory.h 2011-10-13 12:49:41 -04:00
mach-msm ARM: mach-msm: remove mach/memory.h 2011-10-13 12:49:37 -04:00
mach-mv78xx0 ARM: mach-mv78xx0: remove mach/memory.h 2011-10-13 12:49:29 -04:00
mach-mx5 ARM: mach-mx5: convert boot_params to atag_offset 2011-08-21 17:15:01 -04:00
mach-mxs ARM: mach-mxs: remove mach/memory.h 2011-10-13 12:49:39 -04:00
mach-netx ARM: mach-netx: remove mach/memory.h 2011-10-13 12:49:35 -04:00
mach-nomadik ARM: mach-nomadik: remove mach/memory.h 2011-10-13 12:49:33 -04:00
mach-nuc93x ARM: mach-nuc93x: remove mach/memory.h 2011-10-13 12:49:40 -04:00
mach-omap1 Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-omap2 Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-orion5x Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-pnx4008 ARM: mach-pnx4008: remove mach/memory.h 2011-10-13 12:49:31 -04:00
mach-prima2 Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-pxa ARM: mach-pxa: remove mach/memory.h 2011-10-13 12:49:47 -04:00
mach-realview Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +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/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-s3c2410 Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-s3c2412 Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-s3c2416 Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-s3c2440 Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-s3c2443 Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-s5p64x0 Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-s5pc100 Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-s5pv210 Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-sa1100 ARM: add an extra temp register to the low level debugging addruart macro 2011-09-26 10:11:25 -04: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/memory_h' into next/cleanup2 2011-11-01 04:58:59 +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 ARM: mach-tegra: remove mach/memory.h 2011-10-13 12:49:43 -04:00
mach-u300 ARM: add an extra temp register to the low level debugging addruart macro 2011-09-26 10:11:25 -04:00
mach-ux500 ARM: mach-ux500: remove mach/memory.h 2011-10-13 12:49:33 -04:00
mach-versatile ARM: mach-versatile: remove mach/memory.h 2011-10-13 12:49:34 -04:00
mach-vexpress Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-vt8500 ARM: mach-vt8500: remove mach/memory.h 2011-10-13 12:49:44 -04:00
mach-w90x900 ARM: mach-w90x900: remove mach/memory.h 2011-10-13 12:49:30 -04:00
mach-zynq ARM: mach-zynq: remove mach/memory.h 2011-10-13 12:49:49 -04:00
mm Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
nwfpe
oprofile
plat-iop ARM: convert PCI defines to variables 2011-07-12 11:19:29 -05:00
plat-mxc ARM: plat-mxc: remove mach/memory.h 2011-10-13 12:49:50 -04:00
plat-nomadik net: remove mm.h inclusion from netdevice.h 2011-06-21 19:17:20 -07:00
plat-omap Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
plat-orion genirq: replace irq_gc_ack() with {set,clr}_bit variants (fwd) 2011-07-07 16:02:26 +00:00
plat-pxa mmc: sdhci-pxa: move platform data to include/linux/platform_data 2011-07-20 17:20:52 -04:00
plat-s3c24xx ARM: S3C24XX: To merge s3c24xx devs.c files to one devs.c 2011-10-06 11:14:30 +09:00
plat-s5p ARM: S5P: To merge devs.c files to one devs.c 2011-10-06 11:15:09 +09:00
plat-samsung ARM: SAMSUNG: Move fimc plat. device from board files to plat-samsung 2011-10-13 15:41:51 +09:00
plat-spear ARM: spear: remove mach/memory.h and plat/memory.h 2011-10-13 12:49:38 -04: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 Merge branch 'devel-stable' into for-next 2011-07-22 23:09:07 +01:00
Kconfig Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
Kconfig-nommu
Kconfig.debug lib: consolidate DEBUG_STACK_USAGE option 2011-05-25 08:39:54 -07:00
Makefile ARM: 7012/1: Set proper TEXT_OFFSET for newer MSMs 2011-08-13 11:26:18 +01:00