tree 105b5bc4bb96b555dba90fa11dd5af66784c132f
parent 98b98d316349e9a028e632629fe813d07fa5afdd
parent 4ef7e71444b48cc89152cbc499ed94dde50515ee
author Linus Torvalds <torvalds@linux-foundation.org> 1306268915 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1306268915 -0700

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