From: Linus Torvalds Date: Sun, 31 Jul 2011 16:23:08 +0000 (-1000) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 X-Git-Tag: Ubuntu-5.0.0-8.9~18026 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f33c596a2f921696391801b637ed50d514634079;p=mirror_ubuntu-disco-kernel.git 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 --- f33c596a2f921696391801b637ed50d514634079