]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge tag 'bcm-for-3.14-soc' of git://github.com/broadcom/bcm11351 into next/soc
authorOlof Johansson <olof@lixom.net>
Thu, 9 Jan 2014 06:05:42 +0000 (22:05 -0800)
committerOlof Johansson <olof@lixom.net>
Thu, 9 Jan 2014 06:05:42 +0000 (22:05 -0800)
From Christian Daudt, various defconfig udpates to bcm mobile.

* tag 'bcm-for-3.14-soc' of git://github.com/broadcom/bcm11351:
  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

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge