commit f33c596a2f921696391801b637ed50d514634079
author Linus Torvalds <torvalds@linux-foundation.org> Sun Jul 31 06:23:08 2011 -1000
committer Linus Torvalds <torvalds@linux-foundation.org> Sun Jul 31 06:23:08 2011 -1000
tree abc353fe3ef128e60e20a6b73f52858ce6d39eff
parent 250f8e3db646028353a2a737ddb7a894c97a1098
parent 74411c04540404a1ff29d254584ef393e150aeda

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:
  smc91c92_cs.c: fix bogus compiler warning
  orinoco_cs: be more careful when matching cards with ID 0x0156:0x0002
  hostap_cs: support cards with "Version 01.02" as third product ID
  pcmcia: add PCMCIA_DEVICE_MANF_CARD_PROD_ID3
  pxa2xx pcmcia - stargate 2 use gpio array.
  pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.
  drivers:pcmcia:soc_common: make socket_init and socket_suspend optional