projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit49b766ec12650db38e98caafa3cd94e8ff59000c
treebe70876001af55af3759f117c4bded2b267315bftree | snapshot
parent464d155c51db3fc31908cef4101c51c11d3f2a45commit | diff
parent94efb72328afa29ea5fd93e48ed17489afcdaa12commit | diff
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
John Crispins staging tree