2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-18 18:23:53 +08:00
linux-next/arch/arm
Russell King 4ec3eb1363 Merge branch 'smp' into misc
Conflicts:
	arch/arm/kernel/entry-armv.S
	arch/arm/mm/ioremap.c
2011-01-06 22:32:03 +00:00
..
boot ARM: avoid marking decompressor .stack section as having contents 2010-11-22 12:00:59 +00:00
common Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
configs at91: merge all at91rm9200 defconfig in one single file 2010-11-30 10:59:15 +01:00
include/asm Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
kernel Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
lib Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
mach-aaec2000 ARM: 6484/1: fix compile warning in mm/init.c 2010-11-21 22:05:56 +00:00
mach-at91 at91/board-yl-9200: fix typo in video support 2010-11-30 17:23:41 +01:00
mach-bcmring Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
mach-clps711x ARM: 6484/1: fix compile warning in mm/init.c 2010-11-21 22:05:56 +00:00
mach-cns3xxx ARM: 6520/1: Kconfig: add new symbol MIGHT_HAVE_PCI 2010-12-05 08:39:30 +00:00
mach-davinci Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
mach-dove arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-ebsa110 ARM: 6484/1: fix compile warning in mm/init.c 2010-11-21 22:05:56 +00:00
mach-ep93xx Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
mach-footbridge ARM: 6484/1: fix compile warning in mm/init.c 2010-11-21 22:05:56 +00:00
mach-gemini arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-h720x ARM: 6484/1: fix compile warning in mm/init.c 2010-11-21 22:05:56 +00:00
mach-imx Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
mach-integrator Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
mach-iop13xx ARM: DMA: Replace page_to_dma()/dma_to_page() with pfn_to_dma()/dma_to_pfn() 2011-01-03 11:27:43 +00:00
mach-iop32x arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-iop33x arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-ixp4xx arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-ixp23xx arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-ixp2000 ARM: 6460/1: ixp2000: fix type of ixp2000_timer_interrupt 2010-10-27 21:40:28 +01:00
mach-kirkwood Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion 2010-11-07 16:10:56 +00:00
mach-ks8695 ARM: DMA: Replace page_to_dma()/dma_to_page() with pfn_to_dma()/dma_to_pfn() 2011-01-03 11:27:43 +00:00
mach-l7200/include/mach arm: return both physical and virtual addresses from addruart 2010-10-20 00:27:33 -04:00
mach-lh7a40x arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-loki arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-lpc32xx ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
mach-mmp Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
mach-msm ARM: SMP: pass an ipi number to smp_cross_call() 2010-12-03 08:26:30 +00:00
mach-mv78xx0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion 2010-11-07 16:10:56 +00:00
mach-mx3 Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
mach-mx5 ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
mach-mx25 Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
mach-mxc91231 ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
mach-netx ARM: 6484/1: fix compile warning in mm/init.c 2010-11-21 22:05:56 +00:00
mach-nomadik ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
mach-ns9xxx arm: return both physical and virtual addresses from addruart 2010-10-20 00:27:33 -04:00
mach-nuc93x ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
mach-omap1 Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
mach-omap2 Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
mach-orion5x Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion 2010-11-07 16:10:56 +00:00
mach-pnx4008 Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
mach-pxa Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
mach-realview Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
mach-rpc ARM: 6484/1: fix compile warning in mm/init.c 2010-11-21 22:05:56 +00:00
mach-s3c24a0/include/mach Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable 2010-10-28 12:27:34 +01:00
mach-s3c64xx ARM: S3C64XX: fix uart clock setup for mini6410/real6410 2010-11-25 10:58:11 +09:00
mach-s3c2400
mach-s3c2410 ARM: S3C2410: Adapt h1940-bluetooth to gpiolib changes 2010-11-25 10:58:10 +09:00
mach-s3c2412 ARM: Ensure experimental options are so marked 2010-12-05 23:06:22 +00:00
mach-s3c2416 ARM: S3C24XX: Fix UART3 submask on S3C2416 and S3C2443 2010-11-25 10:58:11 +09:00
mach-s3c2440 Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2010-10-30 08:26:25 -07:00
mach-s3c2443 ARM: S3C24XX: Fix UART3 submask on S3C2416 and S3C2443 2010-11-25 10:58:11 +09:00
mach-s5p64x0 Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable 2010-10-28 12:27:34 +01:00
mach-s5p6442 Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable 2010-10-28 12:27:34 +01:00
mach-s5pc100 Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable 2010-10-28 12:27:34 +01:00
mach-s5pv210 ARM: S5PV210: Fix sysdev related warning messages 2010-11-25 10:58:11 +09:00
mach-s5pv310 ARM: CPU hotplug: fix hard-coded control register constants 2010-12-20 15:09:16 +00:00
mach-sa1100 ARM: 6449/1: Fix for compiler warning of uninitialized variable. 2010-10-27 21:40:28 +01:00
mach-shark ARM: 6484/1: fix compile warning in mm/init.c 2010-11-21 22:05:56 +00:00
mach-shmobile Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
mach-spear3xx
mach-spear6xx
mach-stmp37xx arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-stmp378x arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-tcc8k ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
mach-tegra Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
mach-u300 ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
mach-ux500 Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
mach-versatile Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
mach-vexpress Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
mach-w90x900 ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
mm Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
nwfpe Update broken web addresses in arch directory. 2010-10-18 11:03:21 +02:00
oprofile oprofile: Abstract the perf-events backend 2010-10-11 17:46:16 +02:00
plat-iop
plat-mxc ARM i.MX spi: fix compilation for i.MX21 2010-11-15 09:25:04 +01:00
plat-nomadik ARM: 6488/1: nomadik: prevent sched_clock() wraparound 2010-11-21 22:05:57 +00:00
plat-omap Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
plat-orion [ARM] Kirkwood: restrict the scope of the PCIe reset workaround 2010-10-21 15:52:03 -04:00
plat-pxa mmc: sdhci: 8-bit bus width changes 2010-11-22 15:12:04 -05:00
plat-s3c24xx ARM: S3C24XX: Fix wrong s3c_gpio_cfgpull 2010-11-25 10:58:10 +09:00
plat-s5p ARM: S5P: Add initial map for GPIO2 and GPIO3 2010-10-25 16:06:22 +09:00
plat-samsung Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable 2010-10-28 12:27:34 +01:00
plat-spear ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
plat-stmp3xxx ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
plat-tcc arm: return both physical and virtual addresses from addruart 2010-10-20 00:27:33 -04:00
plat-versatile
tools ARM: Update mach-types 2010-09-09 22:49:26 +01:00
vfp ARM: VFP: re-initialize VFP coprocessor access enables on CPU hotplug 2010-12-20 15:09:13 +00:00
Kconfig Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
Kconfig-nommu
Kconfig.debug ARM: Ensure experimental options are so marked 2010-12-05 23:06:22 +00:00
Makefile Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable 2010-10-19 20:12:24 +01:00