]> git.baikalelectronics.ru Git - kernel.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)
commitb1266d80c989f3b11bec336b5ee88453b3ec1abc
tree3b273692ee6a34c603f83a645b29573c404ffc97
parent7af4dfc70ba0eaef5a1fc513fa56c3aa51d474b1
parentb5778b2d00be0be4be8787064c42ce5e1f794eba
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