]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 May 2011 20:28:35 +0000 (13:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 May 2011 20:28:35 +0000 (13:28 -0700)
commit6a0cf60ff8bd47aa06da13b1a9088e367f345c62
tree105b5bc4bb96b555dba90fa11dd5af66784c132f
parent48f547236c3309acd798921ab786abe283886451
parent73832277d1843ad086e78750b1cf015a26f2fa33
Merge git://git.kernel.org/pub/scm/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
drivers/isdn/hisax/elsa_cs.c
drivers/isdn/hisax/teles_cs.c
drivers/net/pcmcia/smc91c92_cs.c
drivers/net/wireless/libertas/if_cs.c