From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 6 Apr 2010 20:03:52 +0000 (-0700)
Subject: Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
X-Git-Tag: v2.6.34-rc4~60
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=0fdf86754f70e813845af4abaa805165ce57a0bb;p=~emulex%2Finfiniband.git

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 up alignf issues
---

0fdf86754f70e813845af4abaa805165ce57a0bb