git.kernel.dk Git - linux-2.6-block.git/commit

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

author	Linus Torvalds <torvalds@linux-foundation.org>
	Thu, 29 Oct 2009 15:14:14 +0000 (08:14 -0700)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Thu, 29 Oct 2009 15:14:14 +0000 (08:14 -0700)
commit	49b766ec12650db38e98caafa3cd94e8ff59000c
tree	be70876001af55af3759f117c4bded2b267315bf	tree \| snapshot
parent	464d155c51db3fc31908cef4101c51c11d3f2a45	commit \| diff
parent	94efb72328afa29ea5fd93e48ed17489afcdaa12	commit \| diff