FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-21 00:42:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
b001befe58
linux/arch/arm
History
Arnd Bergmann b001befe58 Merge branch 'samsung/dt' into next/dt 
* samsung/dt: (3 commit)
  Merge branch 'depends/rmk/for-linus' into samsung/dt
  Merge branch 'depends/rmk/restart' into next/cleanup
  Merge branch 'next/cleanup' into samsung/dt

Conflicts:
	arch/arm/mach-tegra/board-dt.c
	arch/arm/mach-tegra/include/mach/entry-macro.S

The latest version of the samsung/dt branch resolves
all sorts of conflicts with the latest upstream, no functional
changes that are not already there.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-01-07 20:40:51 +00:00
..
boot Merge branch 'samsung/dt' into next/dt 2012-01-07 20:40:51 +00:00
common Merge branch 'devel-stable' into for-linus 2012-01-05 13:24:33 +00:00
configs Merge branch 'next/cleanup' into samsung/dt 2012-01-07 20:23:00 +00:00
include/asm Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
kernel Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
lib ARM: lib: add call_with_stack function for safely changing stack 2011-12-12 16:07:35 +00:00
mach-at91 Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-bcmring Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-clps711x Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-cns3xxx Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-davinci Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-dove Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-ebsa110 Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-ep93xx Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-exynos Merge branch 'depends/rmk/for-linus' into samsung/dt 2012-01-07 12:42:17 +00:00
mach-footbridge Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-gemini ARM: big removal of now unused vmalloc.h files 2011-11-26 19:21:29 -05:00
mach-h720x Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-highbank Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-imx Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-integrator Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-iop13xx Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-iop32x Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-iop33x Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-ixp4xx Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-ixp23xx Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-ixp2000 Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-kirkwood Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-ks8695 Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-l7200/include/mach
mach-lpc32xx Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-mmp Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-msm Merge branch 'next/cleanup' into samsung/dt 2012-01-07 20:23:00 +00:00
mach-mv78xx0 Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-mx5 ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-mxs Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-netx Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-nomadik Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-omap1 Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-omap2 Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-orion5x Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-picoxcell Merge branch 'next/cleanup' into samsung/dt 2012-01-07 20:23:00 +00:00
mach-pnx4008 Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-prima2 Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-pxa Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-realview Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-rpc Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-s3c64xx Merge branch 'depends/rmk/for-linus' into samsung/dt 2012-01-07 12:42:17 +00:00
mach-s3c2410 Merge branch 'depends/rmk/for-linus' into samsung/dt 2012-01-07 12:42:17 +00:00
mach-s3c2412 Merge branch 'depends/rmk/for-linus' into samsung/dt 2012-01-07 12:42:17 +00:00
mach-s3c2416 ARM: 7254/1: restart: S3C24XX: move SWRST based S3C platforms to 2012-01-05 12:57:18 +00:00
mach-s3c2440 Merge branch 'depends/rmk/for-linus' into samsung/dt 2012-01-07 12:42:17 +00:00
mach-s3c2443 ARM: 7254/1: restart: S3C24XX: move SWRST based S3C platforms to 2012-01-05 12:57:18 +00:00
mach-s5p64x0 Merge branch 'depends/rmk/for-linus' into samsung/dt 2012-01-07 12:42:17 +00:00
mach-s5pc100 Merge branch 'depends/rmk/for-linus' into samsung/dt 2012-01-07 12:42:17 +00:00
mach-s5pv210 Merge branch 'depends/rmk/for-linus' into samsung/dt 2012-01-07 12:42:17 +00:00
mach-sa1100 Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-shark Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-shmobile Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-spear3xx Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-spear6xx Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-tegra Merge branch 'samsung/dt' into next/dt 2012-01-07 20:40:51 +00:00
mach-u300 Merge branch 'next/cleanup' into samsung/dt 2012-01-07 20:23:00 +00:00
mach-ux500 Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-versatile Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-vexpress Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-vt8500 ARM: big removal of now unused vmalloc.h files 2011-11-26 19:21:29 -05:00
mach-w90x900 Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-zynq Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mm Merge branch 'devel-stable' into for-linus 2012-01-05 13:24:33 +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 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
plat-mxc Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
plat-nomadik ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime 2011-12-18 23:00:26 +00:00
plat-omap Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
plat-orion Merge branch 'devel-stable' into for-linus 2012-01-05 13:24:33 +00:00
plat-pxa
plat-s3c24xx Merge branch 'depends/rmk/for-linus' into samsung/dt 2012-01-07 12:42:17 +00:00
plat-s5p Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
plat-samsung Merge branch 'depends/rmk/for-linus' into samsung/dt 2012-01-07 12:42:17 +00:00
plat-spear Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
plat-versatile ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime 2011-12-18 23:00:26 +00:00
tools ARM: Update mach-types 2011-12-23 22:58:10 +00:00
vfp
Kconfig Merge branch 'next/cleanup' into samsung/dt 2012-01-07 20:23:00 +00:00
Kconfig-nommu
Kconfig.debug Merge branches 'at91/gpio', 'at91/ioremap', 'drivers/macb-gem-cleanup' and 'msm/misc' into next/cleanup 2011-12-01 12:34:21 +00:00
Makefile arm: Remove TCC subarch from Kconfig/Makefile 2012-01-05 13:33:59 +01:00