linux-kernel-test/arch/arm
Russell King 2e0e943436 Merge branch 'devel-stable' into for-linus
Conflicts:
	arch/arm/kernel/setup.c
	arch/arm/mach-shmobile/board-kota2.c
2012-01-05 13:24:33 +00:00
..
boot Merge branch 'devel-stable' into for-linus 2012-01-05 13:24:33 +00:00
common Merge branch 'devel-stable' into for-linus 2012-01-05 13:24:33 +00:00
configs imx_v4_v5_defconfig: update default configuration 2011-12-19 12:26:06 +01:00
include/asm Merge branch 'devel-stable' into for-linus 2012-01-05 13:24:33 +00:00
kernel Merge branch 'devel-stable' into for-linus 2012-01-05 13:24:33 +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 'devel-stable' into for-linus 2012-01-05 13:24:33 +00:00
mach-bcmring Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-clps711x Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-cns3xxx Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-davinci Merge branch 'devel-stable' into for-linus 2012-01-05 13:24:33 +00:00
mach-dove ARM: big removal of now unused vmalloc.h files 2011-11-26 19:21:29 -05:00
mach-ebsa110 Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-ep93xx Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-exynos Merge branch 'devel-stable' into for-linus 2012-01-05 13:24:33 +00:00
mach-footbridge Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-gemini ARM: big removal of now unused vmalloc.h files 2011-11-26 19:21:29 -05:00
mach-h720x ARM: big removal of now unused vmalloc.h files 2011-11-26 19:21:29 -05:00
mach-highbank Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-imx Merge branch 'devel-stable' into for-linus 2012-01-05 13:24:33 +00:00
mach-integrator Merge branch 'devel-stable' into for-linus 2012-01-05 13:24:33 +00:00
mach-iop13xx ARM: big removal of now unused vmalloc.h files 2011-11-26 19:21:29 -05:00
mach-iop32x Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-iop33x Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-ixp4xx ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime 2011-12-18 23:00:26 +00:00
mach-ixp23xx ARM: big removal of now unused vmalloc.h files 2011-11-26 19:21:29 -05:00
mach-ixp2000 Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-kirkwood Merge branch 'devel-stable' into for-linus 2012-01-05 13:24:33 +00:00
mach-ks8695 Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-l7200/include/mach
mach-lpc32xx Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-mmp ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime 2011-12-18 23:00:26 +00:00
mach-msm Merge branch 'devel-stable' into for-linus 2012-01-05 13:24:33 +00:00
mach-mv78xx0 ARM: big removal of now unused vmalloc.h files 2011-11-26 19:21:29 -05:00
mach-mx5 Merge branch 'imx-fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes 2011-12-13 16:34:25 +00:00
mach-mxs Merge branch 'devel-stable' into for-linus 2012-01-05 13:24:33 +00:00
mach-netx Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-nomadik Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-omap1 Merge branch 'devel-stable' into for-linus 2012-01-05 13:24:33 +00:00
mach-omap2 Merge branch 'devel-stable' into for-linus 2012-01-05 13:24:33 +00:00
mach-orion5x Merge branch 'devel-stable' into for-linus 2012-01-05 13:24:33 +00:00
mach-picoxcell ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime 2011-12-18 23:00:26 +00:00
mach-pnx4008 Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-prima2 Merge branch 'devel-stable' into for-linus 2012-01-05 13:24:33 +00:00
mach-pxa ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime 2011-12-18 23:00:26 +00:00
mach-realview Merge branch 'arm/common-kconfig-refactor+for-rmk' of git://git.linaro.org/people/dmart/linux-2.6-arm into devel-stable 2011-12-19 21:54:35 +00:00
mach-rpc Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-s3c64xx Merge branch 'devel-stable' into for-linus 2012-01-05 13:24:33 +00:00
mach-s3c2410 Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-s3c2412 Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc 2011-11-05 18:18:05 -07:00
mach-s3c2416 Merge branch 'next/devel2' of git://git.linaro.org/people/arnd/arm-soc 2011-11-05 18:21:21 -07:00
mach-s3c2440 Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc 2011-11-05 18:18:05 -07:00
mach-s3c2443 Merge branch 'next/devel2' of git://git.linaro.org/people/arnd/arm-soc 2011-11-05 18:21:21 -07:00
mach-s5p64x0 Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-s5pc100 Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-s5pv210 Merge branch 'devel-stable' into for-linus 2012-01-05 13:24:33 +00:00
mach-sa1100 Merge branch 'devel-stable' into for-linus 2012-01-05 13:24:33 +00:00
mach-shark Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-shmobile Merge branch 'devel-stable' into for-linus 2012-01-05 13:24:33 +00:00
mach-spear3xx Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-spear6xx Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-tcc8k Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-28 12:02:27 -07:00
mach-tegra ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime 2011-12-18 23:00:26 +00:00
mach-u300 ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime 2011-12-18 23:00:26 +00:00
mach-ux500 Merge branch 'devel-stable' into for-linus 2012-01-05 13:24:33 +00:00
mach-versatile Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-vexpress Merge branch 'arm/common-kconfig-refactor+for-rmk' of git://git.linaro.org/people/dmart/linux-2.6-arm into devel-stable 2011-12-19 21:54:35 +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 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
mach-zynq Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +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 ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime 2011-12-18 23:00:26 +00:00
plat-mxc Merge branch 'devel-stable' into for-linus 2012-01-05 13:24:33 +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 ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime 2011-12-18 23:00:26 +00:00
plat-orion Merge branch 'devel-stable' into for-linus 2012-01-05 13:24:33 +00:00
plat-pxa Merge git://git.infradead.org/mtd-2.6 2011-11-07 09:11:16 -08:00
plat-s3c24xx ARM: SAMSUNG: inclusion export.h instead of module.h 2011-11-17 01:14:38 +09:00
plat-s5p ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime 2011-12-18 23:00:26 +00:00
plat-samsung ARM: SAMSUNG: Fix build error when selecting CPU_FREQ_S3C24XX_DEBUGFS on S3C2440 2011-12-28 15:08:28 +09:00
plat-spear Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
plat-tcc ARM: big removal of now unused vmalloc.h files 2011-11-26 19:21:29 -05: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 arm: remove several unnecessary module.h include instances 2011-10-31 19:30:48 -04:00
Kconfig Merge branch 'devel-stable' into for-linus 2012-01-05 13:24:33 +00:00
Kconfig-nommu
Kconfig.debug Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 21:08:03 -07:00
Makefile ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00