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

diff --cc drivers/isdn/hisax/elsa_cs.c
Simple merge

diff --cc drivers/isdn/hisax/teles_cs.c
Simple merge

diff --cc drivers/net/pcmcia/smc91c92_cs.c
Simple merge

diff --cc drivers/net/wireless/libertas/if_cs.c
Simple merge