Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 Jul 2010 16:31:15 +0000 (09:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 Jul 2010 16:31:15 +0000 (09:31 -0700)
* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  pcmcia: fix 'driver ... did not release config properly' warning


Trivial merge