From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Mon, 19 Jul 2021 01:56:58 +0000 (-0700)
Subject: Merge tag 'v5.13' into next
X-Git-Tag: howlett/maple/20220722_2~2317^2~4^2~20
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=320424c7d44f54c18df9812fd7c45f6963524002;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'v5.13' into next

Sync up with the mainline to get the latest parport API.
---

320424c7d44f54c18df9812fd7c45f6963524002