diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-11 13:07:05 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-16 19:10:39 -0800 |
| commit | 1dbb36bc7b9f648c489a5a2f73a5120a4ecab1ed (patch) | |
| tree | ea95c98adf923d22127f5bfc2aca7a2abc631d70 /sound/arm/pxa2xx-pcm.h | |
| parent | 259e43844c46abe545214d0d5c9a538422d2e69a (diff) | |
| parent | 5138d5c562e3bfe30964e20ab46eec9f8b89225d (diff) | |
Merge tag 'berlin-fixes-for-3.19-1' of git://git.infradead.org/users/hesselba/linux-berlin into fixes
Merge "ARM: berlin: Fixes for v3.19 (round 1)" from Sebastian Hesselbarth:
Marvell Berlin fixes for v3.19 round 1:
- SDHCI DT fixes for BG2Q and BG2Q reference board
- BG2Q SM GPIO DT node relocation
* tag 'berlin-fixes-for-3.19-1' of git://git.infradead.org/users/hesselba/linux-berlin:
ARM: dts: berlin: correct BG2Q's SM GPIO location.
ARM: dts: berlin: add broken-cd and set bus width for eMMC in Marvell DMP DT
ARM: dts: berlin: fix io clk and add missing core clk for BG2Q sdhci2 host
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'sound/arm/pxa2xx-pcm.h')
0 files changed, 0 insertions, 0 deletions