diff options
| author | Olof Johansson <olof@lixom.net> | 2014-01-08 22:05:42 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-01-08 23:02:25 -0800 |
| commit | ced015aaa430e559ab2a44e858d25d6fdcca0a79 (patch) | |
| tree | 6fb4f0b32b946648d65097fe28fc7e741ae2be07 /arch/arm/mach-ux500/pm.c | |
| parent | d0f2a5ba07ac8dc671c0acb89d0114352b41e936 (diff) | |
| parent | 047ef2fa4e687b6c0d4e7d47b8a184147151482c (diff) | |
| download | linux-ced015aaa430e559ab2a44e858d25d6fdcca0a79.tar.gz linux-ced015aaa430e559ab2a44e858d25d6fdcca0a79.tar.bz2 linux-ced015aaa430e559ab2a44e858d25d6fdcca0a79.zip | |
Merge tag 'bcm-for-3.14-soc' of git://github.com/broadcom/bcm11351 into next/soc
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>
Diffstat (limited to 'arch/arm/mach-ux500/pm.c')
0 files changed, 0 insertions, 0 deletions