linux_dsm_epyc7002/arch/arm
Olof Johansson ae0b82504e Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/soc
* 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas: (234 commits)
  ARM: shmobile: remove additional __io() macro use
  ARM: mach-shmobile: default to no earlytimer
  ARM: mach-shmobile: r8a7779 and Marzen timer rework
  ARM: mach-shmobile: r8a7740 and Bonito timer rework
  ARM: mach-shmobile: sh73a0, AG5EVM and Kota2 timer rework
  ARM: mach-shmobile: sh7372, AP4EVB and Mackerel timer rework
  ARM: mach-shmobile: sh7377 and G4EVM timer rework
  ARM: mach-shmobile: sh7367 and G3EVM timer rework
  ARM: mach-shmobile: add shmobile_earlytimer_init()
  ARM: mach-shmobile: Move sh7372 AP4EVB external clk setup
  ARM: mach-shmobile: Move sh7372 Mackerel external clk setup
  ARM: mach-shmobile: rename clk_init() to shmobile_clk_init()
  ARM: mach-shmobile: r8a7779 L2 cache support
  ARM: mach-shmobile: r8a7779 map_io and init_early update
  ARM: mach-shmobile: r8a7740 map_io and init_early update
  ARM: mach-shmobile: sh73a0 map_io and init_early update
  ARM: mach-shmobile: sh7372 map_io and init_early update
  ARM: mach-shmobile: sh7377 map_io and init_early update
  ARM: mach-shmobile: sh7367 map_io and init_early update
  sh: remove clk_ops
  ...

  (includes an update to v3.3-rc7)

Conflicts:
	arch/arm/mach-omap2/id.c
2012-03-13 17:38:09 -07:00
..
boot Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/soc 2012-03-13 17:38:09 -07:00
common Merge branch 'imx/defconfig' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc 2012-02-28 12:33:46 +00:00
configs Merge branch 'imx/defconfig' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc 2012-02-28 12:33:46 +00:00
include/asm Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/soc 2012-03-13 17:38:09 -07:00
kernel Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/soc 2012-03-13 17:38:09 -07: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 Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/soc 2012-03-13 17:38:09 -07:00
mach-bcmring Merge branch 'for-arm-soc' of git://sources.calxeda.com/kernel/linux into next/soc 2012-02-10 12:40:34 -08: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 Merge branch 'for-arm-soc' of git://sources.calxeda.com/kernel/linux into next/soc 2012-02-10 12:40:34 -08:00
mach-dove Merge branch 'imx/defconfig' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc 2012-02-28 12:33:46 +00:00
mach-ebsa110 ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-ep93xx Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/soc 2012-03-13 17:38:09 -07:00
mach-exynos Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/soc 2012-03-13 17:38:09 -07: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 Merge branch 'for-arm-soc' of git://sources.calxeda.com/kernel/linux into next/soc 2012-02-10 12:40:34 -08:00
mach-imx i.MX35/5 AIPS setup 2012-03-08 09:20:29 -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 Merge branch 'imx/defconfig' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc 2012-02-28 12:33:46 +00: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 i.MX35/5 AIPS setup 2012-03-08 09:20:29 -08:00
mach-mmp i.MX35/5 AIPS setup 2012-03-08 09:20:29 -08:00
mach-msm Linux 3.3-rc2 2012-02-07 15:05:20 -08:00
mach-mv78xx0 Merge branch 'imx/defconfig' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc 2012-02-28 12:33:46 +00:00
mach-mxs Merge branch 'mxs/clk' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc 2012-02-07 15:13:59 -08:00
mach-netx Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-nomadik Merge branch 'ux500-timers' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/soc 2012-02-07 15:13:50 -08:00
mach-omap1 i.MX35/5 AIPS setup 2012-03-08 09:20:29 -08:00
mach-omap2 Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/soc 2012-03-13 17:38:09 -07:00
mach-orion5x Merge branch 'imx/defconfig' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc 2012-02-28 12:33:46 +00: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 Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/soc 2012-03-13 17:38:09 -07: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 Merge branch 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc 2012-03-10 09:51:26 -08:00
mach-s3c2410 Merge branch 'imx/defconfig' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc 2012-02-28 12:33:46 +00:00
mach-s3c2412 Merge branch 'imx/defconfig' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc 2012-02-28 12:33:46 +00:00
mach-s3c2416 Merge branch 'imx/defconfig' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc 2012-02-28 12:33:46 +00:00
mach-s3c2440 ARM: S3C2440: Fixed build error for s3c244x 2012-03-08 08:57:29 -08:00
mach-s3c2443 ARM: SAMSUNG: Fix missing api-change from subsys_interface change 2012-01-27 15:35:47 +09:00
mach-s5p64x0 Merge branch 'imx/defconfig' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc 2012-02-28 12:33:46 +00:00
mach-s5pc100 Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-s5pv210 Merge branch 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc 2012-03-10 09:51:26 -08: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 Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/soc 2012-03-13 17:38:09 -07: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 Merge tag 'tegra-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/soc 2012-03-04 20:57:06 +00:00
mach-u300 Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-ux500 Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/soc 2012-03-13 17:38:09 -07:00
mach-versatile Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-vexpress Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/soc 2012-03-13 17:38:09 -07: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: 7345/1: errata: update workaround for A9 erratum #743622 2012-02-27 11:22:08 +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 Merge branch 'features/imx3' of git://git.pengutronix.de/git/imx/linux-2.6 into next/soc 2012-03-02 15:04:47 +00:00
plat-nomadik ARM: plat-nomadik: modernize MTU timer 2012-01-31 00:18:26 +01:00
plat-omap Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/soc 2012-03-13 17:38:09 -07:00
plat-orion ARM: orion: Fix USB phy for orion5x. 2012-02-09 16:16:35 -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 Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/soc 2012-03-13 17:38:09 -07:00
plat-s5p ARM: EXYNOS: add support JPEG 2012-03-10 07:26:58 -08:00
plat-samsung Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/soc 2012-03-13 17:38:09 -07:00
plat-spear Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/soc 2012-03-13 17:38:09 -07: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 Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/soc 2012-03-13 17:38:09 -07:00
Kconfig-nommu Fix common misspellings 2011-03-31 11:26:23 -03:00
Kconfig.debug ARM: at91: code removal of CAP9 SoC 2012-02-03 13:33:05 +01: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