From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 29 Oct 2009 15:14:14 +0000 (-0700)
Subject: Merge branch 'urgent-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmci... 
X-Git-Tag: v2.6.32-rc6~53
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=49b766ec12650db38e98caafa3cd94e8ff59000c;p=linux-2.6-block.git

Merge branch 'urgent-v2' of git://git./linux/kernel/git/brodo/pcmcia-2.6

* 'urgent-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  pcmcia: do not load the pd6729 driver if io_base is NULL
  pcmcia: Fix possible printk format warnings
  pcmcia: do not try to store more than 4 version strings
  pcmcia: pccard_read_tuple and TUPLE_RETURN_COMMON cleanup
  pcmcia: properly close previous dev_printk if kzalloc fails in do_io_probe
  pcmcia: fix controller printk format warnings
---

49b766ec12650db38e98caafa3cd94e8ff59000c