2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-18 02:04:05 +08:00
linux-next/arch/arm
Arnd Bergmann 5839fec9d8 Merge branch 'depends/rmk/memory_h' into next/fixes
Fix up all conflicts between the memory.h cleanup and bug fixes.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2011-10-31 23:11:53 +01:00
..
boot arm/dt: Tegra: Add support-8bit to SDHCI nodes 2011-09-22 14:44:28 +00:00
common ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
configs ARM: at91: add defconfig for at91sam9g45 family 2011-10-07 17:40:01 +02:00
include/asm Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
kernel Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +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/fixes 2011-10-31 23:11:53 +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/fixes 2011-10-31 23:11:53 +01:00
mach-davinci Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
mach-dove Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +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/fixes 2011-10-31 23:11:53 +01:00
mach-exynos4 Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
mach-footbridge Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
mach-gemini Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +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/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
mach-integrator Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +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/memory_h' into next/fixes 2011-10-31 23:11:53 +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/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
mach-kirkwood Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
mach-ks8695 Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +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/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
mach-mmp Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
mach-msm Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
mach-mv78xx0 Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
mach-mx5 Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
mach-mxs Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +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/memory_h' into next/fixes 2011-10-31 23:11:53 +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/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
mach-omap2 Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
mach-orion5x Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
mach-pnx4008 Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
mach-prima2 Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
mach-pxa Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
mach-realview Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +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/fixes 2011-10-31 23:11:53 +01:00
mach-s3c2410 Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +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/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
mach-s5p64x0 Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
mach-s5pc100 Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
mach-s5pv210 Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
mach-sa1100 Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +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/memory_h' into next/fixes 2011-10-31 23:11:53 +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/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
mach-u300 Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
mach-ux500 Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
mach-versatile Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
mach-vexpress Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
mach-vt8500 Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
mach-w90x900 Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +01: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/fixes 2011-10-31 23:11:53 +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/memory_h' into next/fixes 2011-10-31 23:11:53 +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/memory_h' into next/fixes 2011-10-31 23:11:53 +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 Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
plat-s3c24xx Merge branch 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-25 12:43:28 -07:00
plat-s5p ARM: S5P: fix incorrect loop iterator usage on gpio-interrupt 2011-09-26 13:17:41 +09:00
plat-samsung ARM: SAMSUNG: fix to prevent declaring duplicated 2011-09-15 15:54:15 +09:00
plat-spear Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +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 Merge branch 'devel-stable' into for-next 2011-07-22 23:09:07 +01:00
Kconfig Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
Kconfig-nommu Fix common misspellings 2011-03-31 11:26:23 -03:00
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