summaryrefslogtreecommitdiffstats
path: root/virt
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2019-11-20 10:04:05 -0800
committerTony Lindgren <tony@atomide.com>2019-11-20 10:04:05 -0800
commitd7d8d62a3f3b50b606c9395298b017bd9fd9c8d4 (patch)
tree487ab7c802f0936eca55a13cd701d9785d4d555a /virt
parentb82049f2c1395d0bf99f0ae291c748c9dcb7d507 (diff)
parent37238d3dd584dc4ce87d844681b89ef58f8200ea (diff)
parentcb6cfe2eaed171b5a2e575fa3f0cf0924b5bd1d2 (diff)
downloadlinux-d7d8d62a3f3b50b606c9395298b017bd9fd9c8d4.tar.bz2
Merge branches 'omap-for-v5.5/soc' and 'omap-for-v5.5/ti-sysc' into omap-for-v5.5/ti-sysc-late