]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
projects / mirror_ubuntu-eoan-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 464d155 94efb72)
Merge branch 'urgent-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmci...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Oct 2009 15:14:14 +0000 (08:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Oct 2009 15:14:14 +0000 (08:14 -0700)
* '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


Trivial merge
Ubuntu Eoan Linux kernel mirror