]> git.kernelconcepts.de Git - mv-sheeva.git/commit
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 28 Apr 2010 14:58:36 +0000 (07:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 28 Apr 2010 14:58:36 +0000 (07:58 -0700)
commit3fb938b2a8bdbcf6086192d90fb7c73425e41fb9
tree3b273692ee6a34c603f83a645b29573c404ffc97
parent970b06485ffee36aa3549dfe4c6b2a2c2118354d
parent83bf6f11e82eba8533f8dbd241b2c2825e42ae5d
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  pcmcia: fix matching rules for pseudo-multi-function cards
  pcmcia: pcmcia_dev_present bugfix