diff options
author | Olof Johansson <olof@lixom.net> | 2020-01-06 09:33:53 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2020-01-06 09:33:53 -0800 |
commit | 4081b335592a46d506e9ab5725ba8d7cd8cea1d9 (patch) | |
tree | 3aed3118e0e16349fdc2c7619046bf3854270c3c /fs/nfs_common/grace.c | |
parent | 3b6930e82439895319bbd4fd5bf2d5b2a29f7915 (diff) | |
parent | 0bc5f749bcb671547c8b126870bc60d06dcaccdf (diff) | |
download | linux-4081b335592a46d506e9ab5725ba8d7cd8cea1d9.tar.gz linux-4081b335592a46d506e9ab5725ba8d7cd8cea1d9.tar.bz2 linux-4081b335592a46d506e9ab5725ba8d7cd8cea1d9.zip |
Merge branch 'mmp/hsic' into arm/dt
* mmp/hsic:
ARM: dts: mmp3-dell-ariel: Enable the HSIC
ARM: dts: mmp3: Add HSIC controllers
dt-bindings: phy: Add binding for marvell,mmp3-hsic-phy
clk: mmp2: Add HSIC clocks
dt-bindings: marvell,mmp2: Add clock ids for the HSIC clocks
+ Linux 5.5-rc2
Diffstat (limited to 'fs/nfs_common/grace.c')
0 files changed, 0 insertions, 0 deletions