From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 May 2011 20:28:35 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f50d1d9e8d964fdd3b4cedfbca8843d1bc5916c1;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

Merge git://git./linux/kernel/git/brodo/pcmcia-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  pcmcia: Make struct pcmcia_device_id const, sound drivers edition
  staging: pcmcia: Convert pcmcia_device_id declarations to const
  pcmcia: Convert pcmcia_device_id declarations to const
  pcmcia: Make declaration and uses of struct pcmcia_device_id const
  pcmcia/sa1100: put sa11x0_pcmcia_hw_init[] to .devinit.data
---

f50d1d9e8d964fdd3b4cedfbca8843d1bc5916c1