diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-12 23:11:58 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-17 04:10:40 +0100 |
| commit | 6fda93b95e388c82a84c201324f77997d82fada2 (patch) | |
| tree | e0bd992af28eae4e6edc42b2818411cce7e3eb6f /drivers/bus/arm-cci.c | |
| parent | ARM: rockchip: disable jtag/sdmmc autoswitching on rk3288 (diff) | |
| parent | ARM: at91: board-dt-sama5: add phy_fixup to override NAND_Tree (diff) | |
| download | linux-6fda93b95e388c82a84c201324f77997d82fada2.tar.xz linux-6fda93b95e388c82a84c201324f77997d82fada2.zip | |
Merge tag 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into fixes
Merge "at91: fixes for 3.19 #1 (ter)" from Nicolas Ferre:
First fixes batch for AT91 on 3.19:
- fix some DT entries
- correct clock entry for the at91sam9263 LCD
- add a phy_fixup for Eth1 on sama5d4
* tag 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
ARM: at91: board-dt-sama5: add phy_fixup to override NAND_Tree
ARM: at91/dt: sam9263: Add missing clocks to lcdc node
ARM: at91: sama5d3: dt: correct the sound route
ARM: at91/dt: sama5d4: fix the timer reg length
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/bus/arm-cci.c')
0 files changed, 0 insertions, 0 deletions