]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branches 'next/fixes-non-critical', 'next/soc' and 'next/dt' into for-next
authorOlof Johansson <olof@lixom.net>
Thu, 9 Jan 2014 06:55:56 +0000 (22:55 -0800)
committerOlof Johansson <olof@lixom.net>
Thu, 9 Jan 2014 07:42:47 +0000 (23:42 -0800)
commitdc5a840a0626010631acf167ea5f2c8b428587ad
tree258aee93ec85323939b4e4cacc1286e05ef1c3a4
parentedf2305d38a176818e2f352d28476b8d59163846
parenta87010ef3261912999302b3d82bd2e155898f816
parent781cb104af81b5518aea87b13f88153187b3f160
parent9ebde306cf482cde18669dd5592665376fb59aef
Merge branches 'next/fixes-non-critical', 'next/soc' and 'next/dt' into for-next

* next/fixes-non-critical:
  irqchip: sirf: set IRQ_LEVEL status_flags

* next/soc:
  ARM: ux500: Enable system suspend with WFI support
  ARM: ux500: turn on PRINTK_TIME in u8500_defconfig
  rename ARCH_BCM to ARCH_BCM_MOBILE (clocksource)
  ARM: bcm_defconfig: Unset CONFIG_CRYPTO_ANSI_CPRNG
  ARM: bcm_defconfig: Do not expect appended DTB
  ARM: bcm_defconfig: CONFIG_OABI_COMPAT default off

* next/dt:
  Revert "ARM: shmobile: r8a7791: Add SSI clocks in device tree"
  Revert "ARM: shmobile: r8a7790: Add SSI clocks in device tree"
  ARM: ux500: regulators: Remove dead code for SD-card regulator
  ARM: ux500: Configure regulator for I/O voltage for SD-card slot
  ARM: ux500: Refactor common DT configs for sdi[n] devices
  ARM: ux500: delete U8540 UART auxdata

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/arm-soc-for-next-contents.txt
arch/arm/boot/dts/r8a7790.dtsi