[git pull] PCMCIA bugfixes for 2.6.38-rc6

[Dominik Brodowski]

Linus,

a few PCMCIA bugfixes have accumulated in the PCMCIA tree, so please pull
from

git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git urgent

The individual patches will be sent out (at least) to the PCMCIA list.

Thanks,
        Dominik


Alan Cox (1):
      cm4000_cs: Fix undefined ops warning

Dominik Brodowski (1):
      pcmcia: re-enable Zoomed Video support

Julia Lawall (1):
      drivers/char/pcmcia/ipwireless/main.c: Convert release_resource to release_region/release_mem_region

Pavel Machek (1):
      pcmcia vs. MECR on pxa25x/sa1111

 drivers/char/pcmcia/cm4000_cs.c       |    3 +-
 drivers/char/pcmcia/ipwireless/main.c |   52 ++++++++++++++++++++------------
 drivers/pcmcia/pcmcia_resource.c      |    2 +
 drivers/pcmcia/pxa2xx_base.c          |    2 +-
 drivers/pcmcia/pxa2xx_base.h          |    1 +
 drivers/pcmcia/pxa2xx_lubbock.c       |    1 +
 include/pcmcia/ds.h                   |    1 +
 7 files changed, 39 insertions(+), 23 deletions(-)