]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branches 'fixes', 'next/cleanup', 'next/drivers' and 'next/soc' into for-next
authorArnd Bergmann <arnd@arndb.de>
Mon, 26 May 2014 19:28:59 +0000 (21:28 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 26 May 2014 19:28:59 +0000 (21:28 +0200)
commit4437c18d46d1c203ed5eb98c4711d052c7bc467e
tree38e1ed6f722d8ab33e4495b019a38457615b44d1
parent88048eb1c37141629129b9cfec50eff4d82f76ce
parent5644b4277fa1d8697479468ad404426a8644149b
parentb33cdd283bd917d431469c29419c2cf2624bd683
parent1b7f0c7b931864642e825a6fd01cde5881b064cc
parente58cf0193c0f268d03d99e5757a0444d88cb5134
Merge branches 'fixes', 'next/cleanup', 'next/drivers' and 'next/soc' into for-next

* fixes:
  ARM: dts: Keep LDO4 always ON for exynos5250-arndale board
  ARM: dts: Fix SPI interrupt numbers for exynos5420
  ARM: dts: fix incorrect ak8975 compatible for exynos4412-trats2 board

* next/cleanup:
  ARM: vexpress: refine dependencies for new code

* next/drivers:
  soc: qcom: fix of_device_id table

* next/soc:
  ARM: sunxi: allow building without reset controller

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/boot/dts/exynos4412-trats2.dts
arch/arm/boot/dts/exynos5420.dtsi
drivers/bus/Kconfig