AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-05 11:56:40 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
a94c7b0a8f
linux_dsm_epyc7002/arch/arm
History
Arnd Bergmann a94c7b0a8f Merge branch 'spear/dt' into next/dt2 
* spear/dt:
  ARM: SPEAr600: Add device-tree support to SPEAr600 boards

(update to v3.3-rc7)

Conflicts:
	arch/arm/mach-spear6xx/spear6xx.c
	arch/arm/mach-vexpress/Kconfig

The conflicts are between the previous contents of the next/dt2
branch and upstream changes from v3.3-rc7.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-03-16 20:25:17 +00:00
..
boot Merge branch 'spear/dt' into next/dt2 2012-03-16 20:25:17 +00:00
common Merge branches 'depends/irqdomain' and 'at91/base2+cleanup' into next/dt 2012-03-02 13:22:19 +00:00
configs Merge branch 'ux500/dt' into next/dt2 2012-03-16 19:51:30 +00:00
include/asm Merge branch 'spear/dt' into next/dt2 2012-03-16 20:25:17 +00:00
kernel Merge branch 'spear/dt' into next/dt2 2012-03-16 20:25:17 +00: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 'at91-3.4-cleanup2-DT2' of git://github.com/at91linux/linux-at91 into next/dt 2012-03-16 13:05:46 +00:00
mach-bcmring Merge branch 'at91-3.4-base2+cleanup' of git://github.com/at91linux/linux-at91 into at91/staging/base2+cleanup 2012-02-29 12:03:08 +00: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 'at91-3.4-base2+cleanup' of git://github.com/at91linux/linux-at91 into at91/staging/base2+cleanup 2012-02-29 12:03:08 +00:00
mach-dove Merge branch 'vexpress-dt-v3.3-rc4' of git://git.linaro.org/people/pawelmoll/linux into next/dt 2012-02-24 12:39:18 +00:00
mach-ebsa110 ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-ep93xx Merge branch 'spear/dt' into next/dt2 2012-03-16 20:25:17 +00:00
mach-exynos Merge branch 'spear/dt' into next/dt2 2012-03-16 20:25:17 +00: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 'ux500/dt' into next/dt2 2012-03-16 19:51:30 +00:00
mach-imx Merge branch 'ux500/dt' into next/dt2 2012-03-16 19:51:30 +00: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 'vexpress-dt-v3.3-rc4' of git://git.linaro.org/people/pawelmoll/linux into next/dt 2012-02-24 12:39:18 +00:00
mach-ks8695 ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-l7200/include/mach
mach-lpc32xx Merge branch 'dt' of git://github.com/hzhuang1/linux into next/dt 2012-03-08 09:27:07 -08:00
mach-mmp Merge branch 'dt' of git://github.com/hzhuang1/linux into next/dt 2012-03-08 09:27:07 -08:00
mach-msm Merge branch 'ux500/dt' into next/dt2 2012-03-16 19:51:30 +00:00
mach-mv78xx0 Merge branch 'vexpress-dt-v3.3-rc4' of git://git.linaro.org/people/pawelmoll/linux into next/dt 2012-02-24 12:39:18 +00:00
mach-mxs Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-netx Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-nomadik Merge branch 'ux500/dt' into next/dt2 2012-03-16 19:51:30 +00:00
mach-omap1 Merge branch 'dt' of git://github.com/hzhuang1/linux into next/dt 2012-03-08 09:27:07 -08:00
mach-omap2 Merge branch 'spear/dt' into next/dt2 2012-03-16 20:25:17 +00:00
mach-orion5x Merge branch 'vexpress-dt-v3.3-rc4' of git://git.linaro.org/people/pawelmoll/linux into next/dt 2012-02-24 12:39:18 +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 Merge branches 'depends/irqdomain' and 'at91/base2+cleanup' into next/dt 2012-03-02 13:22:19 +00:00
mach-pxa Merge branch 'spear/dt' into next/dt2 2012-03-16 20:25:17 +00:00
mach-realview Merge branch 'ux500/dt' into next/dt2 2012-03-16 19:51:30 +00:00
mach-rpc ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
mach-s3c64xx Merge branch 'vexpress-dt-v3.3-rc4' of git://git.linaro.org/people/pawelmoll/linux into next/dt 2012-02-24 12:39:18 +00:00
mach-s3c2410 Merge branch 'vexpress-dt-v3.3-rc4' of git://git.linaro.org/people/pawelmoll/linux into next/dt 2012-02-24 12:39:18 +00:00
mach-s3c2412 Merge branch 'vexpress-dt-v3.3-rc4' of git://git.linaro.org/people/pawelmoll/linux into next/dt 2012-02-24 12:39:18 +00:00
mach-s3c2416 Merge branch 'vexpress-dt-v3.3-rc4' of git://git.linaro.org/people/pawelmoll/linux into next/dt 2012-02-24 12:39:18 +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 'vexpress-dt-v3.3-rc4' of git://git.linaro.org/people/pawelmoll/linux into next/dt 2012-02-24 12:39:18 +00:00
mach-s5pc100 Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-s5pv210 Merge branch 'vexpress-dt-v3.3-rc4' of git://git.linaro.org/people/pawelmoll/linux into next/dt 2012-02-24 12:39:18 +00: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 'ux500/dt' into next/dt2 2012-03-16 19:51:30 +00:00
mach-spear3xx Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-spear6xx Merge branch 'spear/dt' into next/dt2 2012-03-16 20:25:17 +00:00
mach-tegra Merge branch 'ux500/dt' into next/dt2 2012-03-16 19:51:30 +00:00
mach-u300 Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
mach-ux500 Merge branch 'spear/dt' into next/dt2 2012-03-16 20:25:17 +00:00
mach-versatile Merge branches 'depends/irqdomain' and 'at91/base2+cleanup' into next/dt 2012-03-02 13:22:19 +00:00
mach-vexpress Merge branch 'ux500/dt' into next/dt2 2012-03-16 19:51:30 +00: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/imx27-dt' of git://git.pengutronix.de/git/imx/linux-2.6 into next/dt 2012-03-02 14:46:47 +00:00
plat-nomadik ARM: plat-nomadik: modernize MTU timer 2012-01-31 00:18:26 +01:00
plat-omap Merge branch 'spear/dt' into next/dt2 2012-03-16 20:25:17 +00:00
plat-orion ARM: orion: Fix USB phy for orion5x. 2012-02-09 16:16:35 -08:00
plat-pxa
plat-s3c24xx Merge branch 'spear/dt' into next/dt2 2012-03-16 20:25:17 +00:00
plat-s5p Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 2012-01-07 12:03:30 -08:00
plat-samsung ARM: SAMSUNG: Fix memory size for hsotg 2012-03-01 13:19:47 +09:00
plat-spear Merge branch 'spear/dt' into next/dt2 2012-03-16 20:25:17 +00:00
plat-versatile ARM: plat-versatile: convert to twd_local_timer_register() interface 2012-03-13 13:29:58 +00:00
tools ARM: Update mach-types 2011-12-23 22:58:10 +00:00
vfp
Kconfig Merge branch 'spear/dt' into next/dt2 2012-03-16 20:25:17 +00:00
Kconfig-nommu
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