tree bafc26ec92dfe2ae430c0219882adb2c50578b1c
parent 94c4fcec0144e032ef7d4ec761ab81d570b0bc2a
parent 147a27460366ecd35f1425f593cb42d52166c7ff
author Linus Torvalds <torvalds@linux-foundation.org> 1270584232 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1270584232 -0700

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