diff options
| author | Maxime Ripard <maxime.ripard@bootlin.com> | 2019-07-22 21:24:10 +0200 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@bootlin.com> | 2019-07-22 21:24:10 +0200 |
| commit | 03b0f2ce735e97e9f49790d4563c82515b8fa702 (patch) | |
| tree | da561805bffd06bfba81c867f83cacb28f3a64e5 /fs/ocfs2/ocfs2_lockid.h | |
| parent | e4f86e43716443e934d705952902d40de0fa9a05 (diff) | |
| parent | 5f9e832c137075045d15cd6899ab0505cfb2ca4b (diff) | |
| download | linux-03b0f2ce735e97e9f49790d4563c82515b8fa702.tar.bz2 | |
Merge v5.3-rc1 into drm-misc-next
Noralf needs some SPI patches in 5.3 to merge some work on tinydrm.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Diffstat (limited to 'fs/ocfs2/ocfs2_lockid.h')
0 files changed, 0 insertions, 0 deletions