Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 Apr 2010 20:03:52 +0000 (13:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 Apr 2010 20:03:52 +0000 (13:03 -0700)
commit0fdf86754f70e813845af4abaa805165ce57a0bb
treebafc26ec92dfe2ae430c0219882adb2c50578b1c
parent94c4fcec0144e032ef7d4ec761ab81d570b0bc2a
parent147a27460366ecd35f1425f593cb42d52166c7ff
Merge branch 'urgent' of git://git./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