diff options
author | Olof Johansson <olof@lixom.net> | 2013-08-29 10:49:03 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-09-03 10:20:05 -0700 |
commit | 103c6a71207f80e6ecfeba2c21d6246687bb0ee4 (patch) | |
tree | a69dc44415f138264b7180797ce7f0f71f87a884 /arch/arm/plat-samsung/wakeup-mask.c | |
parent | ef8932b94a441a189aaca15ef1b86d9e46b3f933 (diff) | |
parent | 15e22ddf045ed9796d0d2302e759aa7a37826523 (diff) |
Merge branch 'armsoc/for-3.12/dt' of git://github.com/broadcom/bcm11351 into next/dt
From Christian Daudt, DT changes for Broadcom.
* 'armsoc/for-3.12/dt' of git://github.com/broadcom/bcm11351:
ARM: DT: binding fixup to align with vendor-prefixes.txt (DT)
ARM: dts: add sdio blocks to bcm28155-ap board
ARM: dts: align sdio numbers to HW definition
ARM: bcm281xx: DT changes for reboot code
ARM: bcm281xx: Adding bcm28155-ap.dts
Diffstat (limited to 'arch/arm/plat-samsung/wakeup-mask.c')
0 files changed, 0 insertions, 0 deletions