[git pull] PCMCIA updates and fixes for 2.6.28-rc4

[Dominik Brodowski]

Linus,

a few PCMCIA bugfixes are available at

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

The diffstat and list of changes follows, the individual diffs are sent (at
least) to the linux-pcmcia list.

Thanks,
	Dominik

----

Dominik Brodowski (2):
      pcmcia: add braces in error path
      pcmcia: ensure correct logging in do_io_probe

Ilpo Järvinen (1):
      pcmcia: fix indentation & braces disagreement - add braces

Kay Sievers (1):
      pcmcia: struct device - replace bus_id with dev_name(), dev_set_name()

Komuro (1):
      pcmcia: setup resource information for pseudo multifunction devices.

Marc Pignat (1):
      pcmcia: add another pata/ide ID

 drivers/ata/pata_pcmcia.c        |    1 +
 drivers/ide/ide-cs.c             |    1 +
 drivers/pcmcia/cistpl.c          |    3 ++-
 drivers/pcmcia/cs.c              |   14 +++++++-------
 drivers/pcmcia/ds.c              |   11 ++++++-----
 drivers/pcmcia/pcmcia_resource.c |    3 ++-
 drivers/pcmcia/rsrc_nonstatic.c  |    6 +++---
 7 files changed, 22 insertions(+), 17 deletions(-)