diff options
author | Sean Paul <seanpaul@chromium.org> | 2019-04-10 15:50:49 -0400 |
---|---|---|
committer | Sean Paul <seanpaul@chromium.org> | 2019-04-10 15:50:49 -0400 |
commit | 3bfaf1f7044c6a3b1e00fcad2d0529f0da449d67 (patch) | |
tree | 490bc7e8aa29c2ee41eb4813683f1aa23971abd3 /drivers/pwm/pwm-stmpe.c | |
parent | 669105a74a287b14cdec04c64eb51db1bb890f64 (diff) | |
parent | 14d2bd53a47a7e1cb3e03d00a6b952734cf90f3f (diff) | |
download | lwn-3bfaf1f7044c6a3b1e00fcad2d0529f0da449d67.tar.gz lwn-3bfaf1f7044c6a3b1e00fcad2d0529f0da449d67.zip |
Merge drm/drm-next into drm-misc-next
Finally have a reason for a backmerge other than "it's been a while"!
Backmerging drm-next to -misc-next to facilitate Rob Herring's work on
Panfrost.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'drivers/pwm/pwm-stmpe.c')
0 files changed, 0 insertions, 0 deletions