]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/fixes-non-critical' into for-next
authorArnd Bergmann <arnd@arndb.de>
Tue, 19 Feb 2013 15:54:53 +0000 (16:54 +0100)
committerArnd Bergmann <arnd@arndb.de>
Tue, 19 Feb 2013 15:54:53 +0000 (16:54 +0100)
* next/fixes-non-critical: (52 commits)
  ARM: SPEAr13xx: Enable CONFIG_ARCH_HAS_CPUFREQ
  ARM: imx: MACH_MX31ADS_WM1133_EV1 needs REGULATOR_WM8350
  scripts/sortextable: silence script output
  ARM: s3c: i2c: add platform_device forward declaration
  ARM: mvebu: allow selecting mvebu without Armada XP
  ARM: pick Versatile by default for !MMU
  ARM: integrator: fix build with INTEGRATOR_AP off
  ARM: integrator/versatile: fix NOMMU warnings
  ARM: sa1100: don't warn about mach/ide.h
  ARM: shmobile: fix defconfig warning on CONFIG_USB
  ARM: w90x900: fix legacy assembly syntax
  ARM: samsung: fix assembly syntax for new gas
  ARM: disable virt_to_bus/virt_to_bus almost everywhere
  ARM: dts: Correct pin configuration of SD 4 for exynos4x12-pinctrl
  ARM: SAMSUNG: Silence empty switch warning in fimc-core.h
  ARM: SAMSUNG: Silence empty switch warning in sdhci.h
  ARM: msm: proc_comm_boot_wait should not be __init
  arm: vt8500: Update MAINTAINERS entry for arch-vt8500
  ARM: integrator: ensure ap_syscon_base is initialised when !CONFIG_MMU
  ARM: S5PV210: Fix early uart output in fifo mode
  ...

14 files changed:
1  2 
MAINTAINERS
arch/arm/Kconfig
arch/arm/include/asm/memory.h
arch/arm/mach-exynos/common.c
arch/arm/mach-integrator/integrator_ap.c
arch/arm/mach-integrator/integrator_cp.c
arch/arm/mach-omap2/omap-wakeupgen.c
arch/arm/mach-omap2/timer.c
arch/arm/mach-pxa/palmtreo.c
arch/arm/mach-pxa/spitz.c
arch/arm/mach-s3c24xx/mach-osiris.c
arch/arm/mach-sa1100/lart.c
arch/arm/mach-ux500/cpu.c
arch/arm/mach-versatile/core.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge