summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/o2micro.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2017-04-11 07:40:42 +1000
committerDave Airlie <airlied@redhat.com>2017-04-11 07:40:42 +1000
commitb769fefb68cd70385d68220ae341e5a10723fbc0 (patch)
treea2881410c9dc5a3474619d155fac981cfbd4ee8f /drivers/pcmcia/o2micro.h
parent1420f63b8207e966f54caec26d08abdc2ff37193 (diff)
parent39da7c509acff13fc8cb12ec1bb20337c988ed36 (diff)
downloadop-kernel-dev-b769fefb68cd70385d68220ae341e5a10723fbc0.zip
op-kernel-dev-b769fefb68cd70385d68220ae341e5a10723fbc0.tar.gz
Backmerge tag 'v4.11-rc6' into drm-next
Linux 4.11-rc6 drm-misc needs 4.11-rc5, may as well fix conflicts with rc6.
Diffstat (limited to 'drivers/pcmcia/o2micro.h')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud