From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 4 Jun 2020 18:05:27 +0000 (-0700)
Subject: Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a0a4d17e02a80a74a63c7cbb7bc8cea2f0b7d8b1;p=linux.git

Merge branch 'pcmcia-next' of git://git./linux/kernel/git/brodo/linux

Pull pcmcia updates from Dominik Brodowski:
 "Two minor PCMCIA odd fixes: one replacing zero-length arrays with a
  flexible-array member, and one making a local function static"

* 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux:
  pcmcia: make pccard_loop_tuple() static
  pcmcia: Replace zero-length array with flexible-array
---

a0a4d17e02a80a74a63c7cbb7bc8cea2f0b7d8b1