The following commit has been merged in the linux branch: commit 49b766ec12650db38e98caafa3cd94e8ff59000c Merge: 464d155c51db3fc31908cef4101c51c11d3f2a45 94efb72328afa29ea5fd93e48ed17489afcdaa12 Author: Linus Torvalds torvalds@linux-foundation.org Date: Thu Oct 29 08:14:14 2009 -0700

Merge branch 'urgent-v2' of git://git.kernel.org/pub/scm/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