summaryrefslogtreecommitdiff
path: root/Documentation/devicetree/bindings/spi/spi-mt65xx.txt
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2019-12-11 10:35:37 +0200
committerJani Nikula <jani.nikula@intel.com>2019-12-11 11:13:50 +0200
commit023265ed75d8792ca1d555430a8985511d3f8788 (patch)
tree0940ba6f005f102062e5842b4ec8073ecd583ac0 /Documentation/devicetree/bindings/spi/spi-mt65xx.txt
parent2b68392e638dfa5cf4f7b558f62e3ea4def2e605 (diff)
parente42617b825f8073569da76dc4510bfa019b1c35a (diff)
downloadlinux-023265ed75d8792ca1d555430a8985511d3f8788.tar.gz
Merge drm/drm-next into drm-intel-next-queued
Sync up with v5.5-rc1 to get the updated lock_release() API among other things. Fix the conflict reported by Stephen Rothwell [1]. [1] http://lore.kernel.org/r/20191210093957.5120f717@canb.auug.org.au Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'Documentation/devicetree/bindings/spi/spi-mt65xx.txt')
0 files changed, 0 insertions, 0 deletions